summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/engine/conflict_resolver.h2
-rw-r--r--chrome/browser/sync/engine/net/gaia_authenticator.h4
-rw-r--r--chrome/browser/sync/engine/net/syncapi_server_connection_manager.h8
-rw-r--r--chrome/browser/sync/engine/syncer_thread.h2
-rw-r--r--chrome/browser/sync/glue/change_processor.h4
-rw-r--r--chrome/browser/sync/glue/http_bridge.h2
-rw-r--r--chrome/browser/sync/notifier/base/fastalloc.h2
-rw-r--r--chrome/browser/sync/notifier/base/static_assert.h6
-rw-r--r--chrome/browser/sync/notifier/communicator/login_failure.h2
-rw-r--r--chrome/browser/sync/syncable/syncable.cc2
-rw-r--r--chrome/browser/sync/util/event_sys-inl.h12
-rw-r--r--chrome/browser/sync/util/user_settings.cc7
-rw-r--r--chrome/browser/sync/util/user_settings.h2
13 files changed, 28 insertions, 27 deletions
diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
index eb12210..3ba0db1 100644
--- a/chrome/browser/sync/engine/conflict_resolver.h
+++ b/chrome/browser/sync/engine/conflict_resolver.h
@@ -126,4 +126,4 @@ class ConflictResolver {
} // namespace browser_sync
-#endif // CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
+#endif // CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
diff --git a/chrome/browser/sync/engine/net/gaia_authenticator.h b/chrome/browser/sync/engine/net/gaia_authenticator.h
index 264e499..0f818c1 100644
--- a/chrome/browser/sync/engine/net/gaia_authenticator.h
+++ b/chrome/browser/sync/engine/net/gaia_authenticator.h
@@ -153,8 +153,8 @@ class GaiaAuthenticator {
std::string captcha_url;
SignIn signin;
- AuthResults () : credentials_saved(DONT_SAVE_CREDENTIALS),
- auth_error(None) { }
+ AuthResults() : credentials_saved(DONT_SAVE_CREDENTIALS),
+ auth_error(None) { }
};
protected:
diff --git a/chrome/browser/sync/engine/net/syncapi_server_connection_manager.h b/chrome/browser/sync/engine/net/syncapi_server_connection_manager.h
index 84a355e..4758d25 100644
--- a/chrome/browser/sync/engine/net/syncapi_server_connection_manager.h
+++ b/chrome/browser/sync/engine/net/syncapi_server_connection_manager.h
@@ -15,8 +15,8 @@ class HttpPostProviderFactory;
// This provides HTTP Post functionality through the interface provided
// to the sync API by the application hosting the syncer backend.
-class SyncAPIBridgedPost :
- public browser_sync::ServerConnectionManager::Post {
+class SyncAPIBridgedPost
+ : public browser_sync::ServerConnectionManager::Post {
public:
SyncAPIBridgedPost(browser_sync::ServerConnectionManager* scm,
HttpPostProviderFactory* factory)
@@ -41,8 +41,8 @@ class SyncAPIBridgedPost :
// A ServerConnectionManager subclass used by the syncapi layer. We use a
// subclass so that we can override MakePost() to generate a POST object using
// an instance of the HttpPostProviderFactory class.
-class SyncAPIServerConnectionManager :
- public browser_sync::ServerConnectionManager {
+class SyncAPIServerConnectionManager
+ : public browser_sync::ServerConnectionManager {
public:
SyncAPIServerConnectionManager(const std::string& server,
int port,
diff --git a/chrome/browser/sync/engine/syncer_thread.h b/chrome/browser/sync/engine/syncer_thread.h
index f0287d4..84abfdd 100644
--- a/chrome/browser/sync/engine/syncer_thread.h
+++ b/chrome/browser/sync/engine/syncer_thread.h
@@ -74,7 +74,7 @@ class SyncerThread : public base::RefCountedThreadSafe<SyncerThread> {
FRIEND_TEST(SyncerThreadWithSyncerTest, Throttling);
friend class SyncerThreadWithSyncerTest;
friend class SyncerThreadFactory;
-public:
+ public:
// Encapsulates the parameters that make up an interval on which the
// syncer thread is sleeping.
struct WaitInterval {
diff --git a/chrome/browser/sync/glue/change_processor.h b/chrome/browser/sync/glue/change_processor.h
index 55c0c66..fe7719b 100644
--- a/chrome/browser/sync/glue/change_processor.h
+++ b/chrome/browser/sync/glue/change_processor.h
@@ -23,7 +23,7 @@ class UnrecoverableErrorHandler;
class ChangeProcessor : public BookmarkModelObserver,
public ChangeProcessingInterface {
public:
- ChangeProcessor(UnrecoverableErrorHandler* error_handler)
+ explicit ChangeProcessor(UnrecoverableErrorHandler* error_handler)
: running_(false), error_handler_(error_handler),
bookmark_model_(NULL), share_handle_(NULL), model_associator_(NULL) {}
virtual ~ChangeProcessor() { Stop(); }
@@ -181,4 +181,4 @@ class ChangeProcessor : public BookmarkModelObserver,
} // namespace browser_sync
-#endif // CHROME_BROWSER_SYNC_GLUE_CHANGE_APPLICATOR_H_
+#endif // CHROME_BROWSER_SYNC_GLUE_CHANGE_PROCESSOR_H_
diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h
index 9f08540..9ac5af8 100644
--- a/chrome/browser/sync/glue/http_bridge.h
+++ b/chrome/browser/sync/glue/http_bridge.h
@@ -98,7 +98,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
DISALLOW_COPY_AND_ASSIGN(RequestContextGetter);
};
- HttpBridge(RequestContextGetter* context);
+ explicit HttpBridge(RequestContextGetter* context);
// sync_api::HttpPostProvider implementation.
virtual void SetUserAgent(const char* user_agent);
diff --git a/chrome/browser/sync/notifier/base/fastalloc.h b/chrome/browser/sync/notifier/base/fastalloc.h
index 244a1f8..ac0fb46 100644
--- a/chrome/browser/sync/notifier/base/fastalloc.h
+++ b/chrome/browser/sync/notifier/base/fastalloc.h
@@ -12,7 +12,7 @@ namespace notifier {
template<class T, size_t Size>
class FastAlloc {
public:
- FastAlloc() : buffer_(NULL), size_(0) { };
+ FastAlloc() : buffer_(NULL), size_(0) { }
~FastAlloc() { freeBuffer(); }
T* get_buffer(size_t size) {
if (size_ != 0) {
diff --git a/chrome/browser/sync/notifier/base/static_assert.h b/chrome/browser/sync/notifier/base/static_assert.h
index 78e6ac3..12dba44 100644
--- a/chrome/browser/sync/notifier/base/static_assert.h
+++ b/chrome/browser/sync/notifier/base/static_assert.h
@@ -5,9 +5,11 @@
#ifndef CHROME_BROWSER_SYNC_NOTIFIER_BASE_STATIC_ASSERT_H_
#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_STATIC_ASSERT_H_
-template <bool> struct STATIC_ASSERTION_FAILURE;
+template<bool> struct STATIC_ASSERTION_FAILURE;
-template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
+template<> struct STATIC_ASSERTION_FAILURE<true> {
+ enum { value = 1 };
+};
template<int> struct static_assert_test{};
diff --git a/chrome/browser/sync/notifier/communicator/login_failure.h b/chrome/browser/sync/notifier/communicator/login_failure.h
index 1f2a9a6..21d7d36 100644
--- a/chrome/browser/sync/notifier/communicator/login_failure.h
+++ b/chrome/browser/sync/notifier/communicator/login_failure.h
@@ -28,7 +28,7 @@ class LoginFailure {
PROXY_AUTHENTICATION_ERROR,
};
- LoginFailure(LoginError error);
+ explicit LoginFailure(LoginError error);
LoginFailure(LoginError error,
buzz::XmppEngine::Error xmpp_error,
int subcode);
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
index 0ba9dab..af2cf28 100644
--- a/chrome/browser/sync/syncable/syncable.cc
+++ b/chrome/browser/sync/syncable/syncable.cc
@@ -75,7 +75,7 @@ int64 Now() {
LARGE_INTEGER n;
memcpy(&n, &filetime, sizeof(filetime));
return n.QuadPart;
-#elif (defined(OS_LINUX) || defined(OS_MACOSX))
+#elif defined(OS_LINUX) || defined(OS_MACOSX)
struct timeval tv;
gettimeofday(&tv, NULL);
return static_cast<int64>(tv.tv_sec);
diff --git a/chrome/browser/sync/util/event_sys-inl.h b/chrome/browser/sync/util/event_sys-inl.h
index 320a6f93..104ac85 100644
--- a/chrome/browser/sync/util/event_sys-inl.h
+++ b/chrome/browser/sync/util/event_sys-inl.h
@@ -294,12 +294,12 @@ class SimpleHookup
template <typename EventChannel, typename EventTraits,
typename CallbackObject, typename CallbackMethod,
typename CallbackArg0>
-class ArgHookup :
- public EventListenerHookupImpl<EventChannel, EventTraits,
- ArgHookup<EventChannel, EventTraits,
- CallbackObject,
- CallbackMethod,
- CallbackArg0> > {
+class ArgHookup
+ : public EventListenerHookupImpl<EventChannel, EventTraits,
+ ArgHookup<EventChannel, EventTraits,
+ CallbackObject,
+ CallbackMethod,
+ CallbackArg0> > {
public:
ArgHookup(EventChannel* channel, CallbackObject* cbobject,
CallbackMethod cbmethod, CallbackArg0 arg0)
diff --git a/chrome/browser/sync/util/user_settings.cc b/chrome/browser/sync/util/user_settings.cc
index ea8d8e4..e215c9b 100644
--- a/chrome/browser/sync/util/user_settings.cc
+++ b/chrome/browser/sync/util/user_settings.cc
@@ -39,12 +39,11 @@ static const char SALT[] = "salt2";
static const int kSaltSize = 20;
static const int kCurrentDBVersion = 11;
-UserSettings::ScopedDBHandle::ScopedDBHandle(UserSettings* settings) :
- mutex_lock_(settings->dbhandle_mutex_), handle_(&settings->dbhandle_) {
+UserSettings::ScopedDBHandle::ScopedDBHandle(UserSettings* settings)
+ : mutex_lock_(settings->dbhandle_mutex_), handle_(&settings->dbhandle_) {
}
-UserSettings::UserSettings() :
- dbhandle_(NULL) {
+UserSettings::UserSettings() : dbhandle_(NULL) {
}
string UserSettings::email() const {
diff --git a/chrome/browser/sync/util/user_settings.h b/chrome/browser/sync/util/user_settings.h
index 8f7197d..96b9f29 100644
--- a/chrome/browser/sync/util/user_settings.h
+++ b/chrome/browser/sync/util/user_settings.h
@@ -77,7 +77,7 @@ class UserSettings {
protected:
struct ScopedDBHandle {
- ScopedDBHandle(UserSettings* settings);
+ explicit ScopedDBHandle(UserSettings* settings);
inline sqlite3* get() const { return *handle_; }
AutoLock mutex_lock_;
sqlite3** const handle_;
generated by cgit v1.1 at 2025-03-10 21:42:41 +0000