Skip to content

Commit

Permalink
Fix incorrect line endsing for some gcm_driver files
Browse files Browse the repository at this point in the history
BUG=none
TEST=none
TBR=zea@chromium.org

Review URL: https://codereview.chromium.org/321593003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275519 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
jianli@chromium.org committed Jun 6, 2014
1 parent 69ebab4 commit 99bbc17
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 92 deletions.
70 changes: 35 additions & 35 deletions components/gcm_driver/default_gcm_app_handler.h
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
// Copyright (c) 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef COMPONENTS_GCM_DRIVER_DEFAULT_GCM_APP_HANDLER_H_
#define COMPONENTS_GCM_DRIVER_DEFAULT_GCM_APP_HANDLER_H_

#include "base/compiler_specific.h"
#include "components/gcm_driver/gcm_app_handler.h"

namespace gcm {

// The default app handler that is triggered when there is no registered app
// handler for an application id.
class DefaultGCMAppHandler : public GCMAppHandler {
public:
DefaultGCMAppHandler();
virtual ~DefaultGCMAppHandler();

// Overridden from GCMAppHandler:
virtual void ShutdownHandler() OVERRIDE;
virtual void OnMessage(const std::string& app_id,
const GCMClient::IncomingMessage& message) OVERRIDE;
virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE;
virtual void OnSendError(
const std::string& app_id,
const GCMClient::SendErrorDetails& send_error_details) OVERRIDE;

private:
DISALLOW_COPY_AND_ASSIGN(DefaultGCMAppHandler);
};

} // namespace gcm

#endif // COMPONENTS_GCM_DRIVER_DEFAULT_GCM_APP_HANDLER_H_
// Copyright (c) 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef COMPONENTS_GCM_DRIVER_DEFAULT_GCM_APP_HANDLER_H_
#define COMPONENTS_GCM_DRIVER_DEFAULT_GCM_APP_HANDLER_H_

#include "base/compiler_specific.h"
#include "components/gcm_driver/gcm_app_handler.h"

namespace gcm {

// The default app handler that is triggered when there is no registered app
// handler for an application id.
class DefaultGCMAppHandler : public GCMAppHandler {
public:
DefaultGCMAppHandler();
virtual ~DefaultGCMAppHandler();

// Overridden from GCMAppHandler:
virtual void ShutdownHandler() OVERRIDE;
virtual void OnMessage(const std::string& app_id,
const GCMClient::IncomingMessage& message) OVERRIDE;
virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE;
virtual void OnSendError(
const std::string& app_id,
const GCMClient::SendErrorDetails& send_error_details) OVERRIDE;

private:
DISALLOW_COPY_AND_ASSIGN(DefaultGCMAppHandler);
};

} // namespace gcm

#endif // COMPONENTS_GCM_DRIVER_DEFAULT_GCM_APP_HANDLER_H_
60 changes: 30 additions & 30 deletions components/gcm_driver/gcm_client_factory.h
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
// Copyright (c) 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef COMPONENTS_GCM_DRIVER_GCM_CLIENT_FACTORY_H_
#define COMPONENTS_GCM_DRIVER_GCM_CLIENT_FACTORY_H_

#include "base/macros.h"
#include "base/memory/scoped_ptr.h"

namespace gcm {

class GCMClient;

class GCMClientFactory {
public:
GCMClientFactory();
virtual ~GCMClientFactory();

// Creates a new instance of GCMClient. The testing code could override this
// to provide a mocked instance.
virtual scoped_ptr<GCMClient> BuildInstance();

private:
DISALLOW_COPY_AND_ASSIGN(GCMClientFactory);
};

} // namespace gcm

#endif // COMPONENTS_GCM_DRIVER_GCM_CLIENT_FACTORY_H_
// Copyright (c) 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef COMPONENTS_GCM_DRIVER_GCM_CLIENT_FACTORY_H_
#define COMPONENTS_GCM_DRIVER_GCM_CLIENT_FACTORY_H_

#include "base/macros.h"
#include "base/memory/scoped_ptr.h"

namespace gcm {

class GCMClient;

class GCMClientFactory {
public:
GCMClientFactory();
virtual ~GCMClientFactory();

// Creates a new instance of GCMClient. The testing code could override this
// to provide a mocked instance.
virtual scoped_ptr<GCMClient> BuildInstance();

private:
DISALLOW_COPY_AND_ASSIGN(GCMClientFactory);
};

} // namespace gcm

#endif // COMPONENTS_GCM_DRIVER_GCM_CLIENT_FACTORY_H_
54 changes: 27 additions & 27 deletions components/gcm_driver/system_encryptor.h
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
// Copyright (c) 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef COMPONENTS_GCM_DRIVER_SYSTEM_ENCRYPTOR_H_
#define COMPONENTS_GCM_DRIVER_SYSTEM_ENCRYPTOR_H_

#include "base/compiler_specific.h"
#include "google_apis/gcm/base/encryptor.h"

namespace gcm {

// Encryptor that uses the Chrome password manager's encryptor.
class SystemEncryptor : public Encryptor {
public:
virtual ~SystemEncryptor();

virtual bool EncryptString(const std::string& plaintext,
std::string* ciphertext) OVERRIDE;

virtual bool DecryptString(const std::string& ciphertext,
std::string* plaintext) OVERRIDE;
};

} // namespace gcm

#endif // COMPONENTS_GCM_DRIVER_SYSTEM_ENCRYPTOR_H_
// Copyright (c) 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef COMPONENTS_GCM_DRIVER_SYSTEM_ENCRYPTOR_H_
#define COMPONENTS_GCM_DRIVER_SYSTEM_ENCRYPTOR_H_

#include "base/compiler_specific.h"
#include "google_apis/gcm/base/encryptor.h"

namespace gcm {

// Encryptor that uses the Chrome password manager's encryptor.
class SystemEncryptor : public Encryptor {
public:
virtual ~SystemEncryptor();

virtual bool EncryptString(const std::string& plaintext,
std::string* ciphertext) OVERRIDE;

virtual bool DecryptString(const std::string& ciphertext,
std::string* plaintext) OVERRIDE;
};

} // namespace gcm

#endif // COMPONENTS_GCM_DRIVER_SYSTEM_ENCRYPTOR_H_

0 comments on commit 99bbc17

Please sign in to comment.