Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(767)

Side by Side Diff: components/gcm_driver/gcm_profile_service.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/gcm_driver/gcm_driver_desktop_unittest.cc ('k') | components/google/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/gcm_driver/gcm_profile_service.h" 5 #include "components/gcm_driver/gcm_profile_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/prefs/pref_service.h"
12 #include "build/build_config.h" 13 #include "build/build_config.h"
13 #include "components/gcm_driver/gcm_driver.h" 14 #include "components/gcm_driver/gcm_driver.h"
14 #include "components/gcm_driver/gcm_driver_constants.h" 15 #include "components/gcm_driver/gcm_driver_constants.h"
15 #include "components/pref_registry/pref_registry_syncable.h" 16 #include "components/pref_registry/pref_registry_syncable.h"
16 #include "components/prefs/pref_service.h"
17 17
18 #if defined(OS_ANDROID) 18 #if defined(OS_ANDROID)
19 #include "base/sequenced_task_runner.h" 19 #include "base/sequenced_task_runner.h"
20 #include "base/threading/sequenced_worker_pool.h" 20 #include "base/threading/sequenced_worker_pool.h"
21 #include "components/gcm_driver/gcm_driver_android.h" 21 #include "components/gcm_driver/gcm_driver_android.h"
22 #else 22 #else
23 #include "base/bind.h" 23 #include "base/bind.h"
24 #include "base/files/file_path.h" 24 #include "base/files/file_path.h"
25 #include "base/memory/weak_ptr.h" 25 #include "base/memory/weak_ptr.h"
26 #include "components/gcm_driver/gcm_account_tracker.h" 26 #include "components/gcm_driver/gcm_account_tracker.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 driver_.reset(driver); 176 driver_.reset(driver);
177 #if !defined(OS_ANDROID) 177 #if !defined(OS_ANDROID)
178 if (identity_observer_) { 178 if (identity_observer_) {
179 identity_observer_.reset(new IdentityObserver( 179 identity_observer_.reset(new IdentityObserver(
180 profile_identity_provider_.get(), request_context_, driver)); 180 profile_identity_provider_.get(), request_context_, driver));
181 } 181 }
182 #endif // !defined(OS_ANDROID) 182 #endif // !defined(OS_ANDROID)
183 } 183 }
184 184
185 } // namespace gcm 185 } // namespace gcm
OLDNEW
« no previous file with comments | « components/gcm_driver/gcm_driver_desktop_unittest.cc ('k') | components/google/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698