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

Side by Side Diff: chrome/browser/ui/webui/sync_internals_message_handler.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/ui/webui/sync_internals_message_handler.h" 5 #include "chrome/browser/ui/webui/sync_internals_message_handler.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/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/sync/profile_sync_service_factory.h" 13 #include "chrome/browser/sync/profile_sync_service_factory.h"
14 #include "chrome/common/channel_info.h" 14 #include "chrome/common/channel_info.h"
15 #include "components/browser_sync/profile_sync_service.h" 15 #include "components/browser_sync/profile_sync_service.h"
16 #include "components/signin/core/browser/signin_manager_base.h" 16 #include "components/signin/core/browser/signin_manager_base.h"
17 #include "components/sync/base/weak_handle.h" 17 #include "components/sync/base/weak_handle.h"
18 #include "components/sync/driver/about_sync_util.h" 18 #include "components/sync/driver/about_sync_util.h"
19 #include "components/sync/driver/sync_service.h" 19 #include "components/sync/driver/sync_service.h"
20 #include "components/sync/engine/cycle/commit_counters.h" 20 #include "components/sync/engine/cycle/commit_counters.h"
21 #include "components/sync/engine/cycle/status_counters.h" 21 #include "components/sync/engine/cycle/status_counters.h"
22 #include "components/sync/engine/cycle/update_counters.h" 22 #include "components/sync/engine/cycle/update_counters.h"
23 #include "components/sync/engine/events/protocol_event.h" 23 #include "components/sync/engine/events/protocol_event.h"
24 #include "components/sync/js/js_event_details.h" 24 #include "components/sync/js/js_event_details.h"
25 #include "content/public/browser/browser_thread.h" 25 #include "content/public/browser/browser_thread.h"
26 #include "content/public/browser/web_ui.h" 26 #include "content/public/browser/web_ui.h"
27 27
28 using browser_sync::ProfileSyncService;
28 using syncer::JsEventDetails; 29 using syncer::JsEventDetails;
29 using syncer::ModelTypeSet; 30 using syncer::ModelTypeSet;
30 using syncer::WeakHandle; 31 using syncer::WeakHandle;
31 32
32 namespace { 33 namespace {
33 class UtilAboutSyncDataExtractor : public AboutSyncDataExtractor { 34 class UtilAboutSyncDataExtractor : public AboutSyncDataExtractor {
34 public: 35 public:
35 std::unique_ptr<base::DictionaryValue> ConstructAboutInformation( 36 std::unique_ptr<base::DictionaryValue> ConstructAboutInformation(
36 sync_driver::SyncService* service, 37 sync_driver::SyncService* service,
37 SigninManagerBase* signin) override { 38 SigninManagerBase* signin) override {
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 *value); 245 *value);
245 } 246 }
246 247
247 // Gets the ProfileSyncService of the underlying original profile. 248 // Gets the ProfileSyncService of the underlying original profile.
248 // May return NULL (e.g., if sync is disabled on the command line). 249 // May return NULL (e.g., if sync is disabled on the command line).
249 ProfileSyncService* SyncInternalsMessageHandler::GetProfileSyncService() { 250 ProfileSyncService* SyncInternalsMessageHandler::GetProfileSyncService() {
250 Profile* profile = Profile::FromWebUI(web_ui()); 251 Profile* profile = Profile::FromWebUI(web_ui());
251 return ProfileSyncServiceFactory::GetForProfile( 252 return ProfileSyncServiceFactory::GetForProfile(
252 profile->GetOriginalProfile()); 253 profile->GetOriginalProfile());
253 } 254 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/sync_internals_message_handler.h ('k') | chrome/browser/ui/webui/sync_internals_ui_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698