diff options
| author | kkimlabs <kkimlabs@chromium.org> | 2014-10-20 20:27:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 03:31:58 +0000 |
| commit | dbd94aa27449ebbc81d44daa8b791a204fbfae4b (patch) | |
| tree | 25791b07a6e429c84ff3e2098940d0017adfa8bd /components/enhanced_bookmarks/bookmark_server_service.h | |
| parent | d5366cb1ad27e6bf1ae659f374a9b9dd3186761d (diff) | |
| download | chromium_src-dbd94aa27449ebbc81d44daa8b791a204fbfae4b.zip chromium_src-dbd94aa27449ebbc81d44daa8b791a204fbfae4b.tar.gz chromium_src-dbd94aa27449ebbc81d44daa8b791a204fbfae4b.tar.bz2 | |
Skip enhanced bookmarks cluster requests if it's not being used.
BUG=424254
Review URL: https://codereview.chromium.org/665133004
Cr-Commit-Position: refs/heads/master@{#300410}
Diffstat (limited to 'components/enhanced_bookmarks/bookmark_server_service.h')
| -rw-r--r-- | components/enhanced_bookmarks/bookmark_server_service.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/components/enhanced_bookmarks/bookmark_server_service.h b/components/enhanced_bookmarks/bookmark_server_service.h index d8cba89..42e848d 100644 --- a/components/enhanced_bookmarks/bookmark_server_service.h +++ b/components/enhanced_bookmarks/bookmark_server_service.h @@ -47,7 +47,7 @@ class BookmarkServerService : protected net::URLFetcherDelegate, EnhancedBookmarkModel* enhanced_bookmark_model); virtual ~BookmarkServerService(); - void AddObserver(BookmarkServerServiceObserver* observer); + virtual void AddObserver(BookmarkServerServiceObserver* observer); void RemoveObserver(BookmarkServerServiceObserver* observer); protected: @@ -84,6 +84,10 @@ class BookmarkServerService : protected net::URLFetcherDelegate, // Cached pointer to the bookmarks model. EnhancedBookmarkModel* model_; // weak + protected: + // The observers. + ObserverList<BookmarkServerServiceObserver> observers_; + private: FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, Cluster); FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, SignOut); @@ -100,8 +104,6 @@ class BookmarkServerService : protected net::URLFetcherDelegate, virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, const GoogleServiceAuthError& error) override; - // The observers. - ObserverList<BookmarkServerServiceObserver> observers_; // The Auth service is used to get a token for auth with the server. ProfileOAuth2TokenService* token_service_; // Weak // The request to the token service. |