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

Side by Side Diff: chrome/browser/ui/avatar_button_error_controller.cc

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/avatar_button_error_controller.h" 5 #include "chrome/browser/ui/avatar_button_error_controller.h"
6 6
7 #include "chrome/browser/profiles/profiles_state.h" 7 #include "chrome/browser/profiles/profiles_state.h"
8 #include "chrome/browser/sync/profile_sync_service_factory.h" 8 #include "chrome/browser/sync/profile_sync_service_factory.h"
9 #include "components/browser_sync/profile_sync_service.h" 9 #include "components/browser_sync/profile_sync_service.h"
10 #include "components/signin/core/browser/signin_error_controller.h" 10 #include "components/signin/core/browser/signin_error_controller.h"
11 #include "components/signin/core/common/profile_management_switches.h" 11 #include "components/signin/core/common/profile_management_switches.h"
12 12
13 using syncer::SyncErrorController;
14
15 AvatarButtonErrorController::AvatarButtonErrorController( 13 AvatarButtonErrorController::AvatarButtonErrorController(
16 AvatarButtonErrorControllerDelegate* delegate, 14 AvatarButtonErrorControllerDelegate* delegate,
17 Profile* profile) 15 Profile* profile)
18 : delegate_(delegate), 16 : delegate_(delegate),
19 avatar_signin_error_controller_(profile, this), 17 avatar_signin_error_controller_(profile, this),
20 avatar_sync_error_controller_(profile, this), 18 avatar_sync_error_controller_(profile, this),
21 has_signin_error_(avatar_signin_error_controller_.HasSigninError()), 19 has_signin_error_(avatar_signin_error_controller_.HasSigninError()),
22 has_sync_error_(avatar_sync_error_controller_.HasSyncError()) {} 20 has_sync_error_(avatar_sync_error_controller_.HasSyncError()) {}
23 21
24 AvatarButtonErrorController::~AvatarButtonErrorController() {} 22 AvatarButtonErrorController::~AvatarButtonErrorController() {}
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 } 99 }
102 100
103 SyncErrorController* AvatarButtonErrorController::SyncErrorObserver:: 101 SyncErrorController* AvatarButtonErrorController::SyncErrorObserver::
104 GetSyncErrorControllerIfNeeded() { 102 GetSyncErrorControllerIfNeeded() {
105 if (!switches::IsMaterialDesignUserMenu()) 103 if (!switches::IsMaterialDesignUserMenu())
106 return nullptr; 104 return nullptr;
107 browser_sync::ProfileSyncService* sync_service = 105 browser_sync::ProfileSyncService* sync_service =
108 ProfileSyncServiceFactory::GetForProfile(profile_); 106 ProfileSyncServiceFactory::GetForProfile(profile_);
109 return sync_service ? sync_service->sync_error_controller() : nullptr; 107 return sync_service ? sync_service->sync_error_controller() : nullptr;
110 } 108 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/avatar_button_error_controller.h ('k') | chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698