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

Side by Side Diff: chrome/browser/sync/sync_global_error.h

Issue 9959038: Removed ProfileSyncService::UIShouldDepictAuthInProgress (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged with ToT. Created 8 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_ 5 #ifndef CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_
6 #define CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_ 6 #define CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "chrome/browser/sync/profile_sync_service_observer.h" 11 #include "chrome/browser/sync/profile_sync_service_observer.h"
12 #include "chrome/browser/ui/global_error.h" 12 #include "chrome/browser/ui/global_error.h"
13 13
14 class ProfileSyncService; 14 class ProfileSyncService;
15 class SigninManager;
15 16
16 // Shows sync errors on the wrench menu using a bubble view and a 17 // Shows sync errors on the wrench menu using a bubble view and a
17 // menu item. 18 // menu item.
18 class SyncGlobalError : public GlobalError, 19 class SyncGlobalError : public GlobalError,
19 public ProfileSyncServiceObserver { 20 public ProfileSyncServiceObserver {
20 public: 21 public:
21 explicit SyncGlobalError(ProfileSyncService* service); 22 SyncGlobalError(ProfileSyncService* service, SigninManager* signin);
22 virtual ~SyncGlobalError(); 23 virtual ~SyncGlobalError();
23 24
24 virtual bool HasBadge() OVERRIDE; 25 virtual bool HasBadge() OVERRIDE;
25 26
26 virtual bool HasMenuItem() OVERRIDE; 27 virtual bool HasMenuItem() OVERRIDE;
27 virtual int MenuItemCommandID() OVERRIDE; 28 virtual int MenuItemCommandID() OVERRIDE;
28 virtual string16 MenuItemLabel() OVERRIDE; 29 virtual string16 MenuItemLabel() OVERRIDE;
29 virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; 30 virtual void ExecuteMenuItem(Browser* browser) OVERRIDE;
30 31
31 virtual bool HasBubbleView() OVERRIDE; 32 virtual bool HasBubbleView() OVERRIDE;
(...skipping 10 matching lines...) Expand all
42 43
43 // For non-ChromeOS we customize the "Sign in to sync" wrench menu item 44 // For non-ChromeOS we customize the "Sign in to sync" wrench menu item
44 // instead of adding a new wrench menu item at the bottom. 45 // instead of adding a new wrench menu item at the bottom.
45 bool HasCustomizedSyncMenuItem(); 46 bool HasCustomizedSyncMenuItem();
46 47
47 private: 48 private:
48 string16 bubble_accept_label_; 49 string16 bubble_accept_label_;
49 string16 bubble_message_; 50 string16 bubble_message_;
50 string16 menu_label_; 51 string16 menu_label_;
51 ProfileSyncService* service_; 52 ProfileSyncService* service_;
53 SigninManager* signin_;
52 54
53 DISALLOW_COPY_AND_ASSIGN(SyncGlobalError); 55 DISALLOW_COPY_AND_ASSIGN(SyncGlobalError);
54 }; 56 };
55 57
56 #endif // CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_ 58 #endif // CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_mock.h ('k') | chrome/browser/sync/sync_global_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698