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

Side by Side Diff: chrome/browser/ui/browser_command_controller.h

Issue 12077030: Allow signin to continue even if sync is disabled by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows sync integration test failure Created 7 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 | 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_UI_BROWSER_COMMAND_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_
7 7
8 #include "base/prefs/public/pref_change_registrar.h" 8 #include "base/prefs/public/pref_change_registrar.h"
9 #include "chrome/browser/api/sync/profile_sync_service_observer.h" 9 #include "chrome/browser/api/sync/profile_sync_service_observer.h"
10 #include "chrome/browser/command_updater.h" 10 #include "chrome/browser/command_updater.h"
(...skipping 12 matching lines...) Expand all
23 23
24 namespace content { 24 namespace content {
25 struct NativeWebKeyboardEvent; 25 struct NativeWebKeyboardEvent;
26 } 26 }
27 27
28 namespace chrome { 28 namespace chrome {
29 29
30 class BrowserCommandController : public CommandUpdaterDelegate, 30 class BrowserCommandController : public CommandUpdaterDelegate,
31 public content::NotificationObserver, 31 public content::NotificationObserver,
32 public ProfileInfoCacheObserver, 32 public ProfileInfoCacheObserver,
33 public ProfileSyncServiceObserver,
34 public TabStripModelObserver, 33 public TabStripModelObserver,
35 public TabRestoreServiceObserver { 34 public TabRestoreServiceObserver {
36 public: 35 public:
37 BrowserCommandController(Browser* browser, ProfileManager* profile_manager); 36 BrowserCommandController(Browser* browser, ProfileManager* profile_manager);
38 virtual ~BrowserCommandController(); 37 virtual ~BrowserCommandController();
39 38
40 CommandUpdater* command_updater() { return &command_updater_; } 39 CommandUpdater* command_updater() { return &command_updater_; }
41 bool block_command_execution() const { return block_command_execution_; } 40 bool block_command_execution() const { return block_command_execution_; }
42 41
43 // Returns true if |command_id| is a reserved command whose keyboard shortcuts 42 // Returns true if |command_id| is a reserved command whose keyboard shortcuts
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 102
104 // Overridden from ProfileInfoCacheObserver: 103 // Overridden from ProfileInfoCacheObserver:
105 virtual void OnProfileAdded(const FilePath& profile_path) OVERRIDE; 104 virtual void OnProfileAdded(const FilePath& profile_path) OVERRIDE;
106 virtual void OnProfileWillBeRemoved(const FilePath& profile_path) OVERRIDE; 105 virtual void OnProfileWillBeRemoved(const FilePath& profile_path) OVERRIDE;
107 virtual void OnProfileWasRemoved(const FilePath& profile_path, 106 virtual void OnProfileWasRemoved(const FilePath& profile_path,
108 const string16& profile_name) OVERRIDE; 107 const string16& profile_name) OVERRIDE;
109 virtual void OnProfileNameChanged(const FilePath& profile_path, 108 virtual void OnProfileNameChanged(const FilePath& profile_path,
110 const string16& old_profile_name) OVERRIDE; 109 const string16& old_profile_name) OVERRIDE;
111 virtual void OnProfileAvatarChanged(const FilePath& profile_path) OVERRIDE; 110 virtual void OnProfileAvatarChanged(const FilePath& profile_path) OVERRIDE;
112 111
113 // Overridden from ProfileSyncServiceObserver:
114 virtual void OnStateChanged() OVERRIDE;
115
116 // Overridden from TabStripModelObserver: 112 // Overridden from TabStripModelObserver:
117 virtual void TabInsertedAt(content::WebContents* contents, 113 virtual void TabInsertedAt(content::WebContents* contents,
118 int index, 114 int index,
119 bool foreground) OVERRIDE; 115 bool foreground) OVERRIDE;
120 virtual void TabDetachedAt(content::WebContents* contents, 116 virtual void TabDetachedAt(content::WebContents* contents,
121 int index) OVERRIDE; 117 int index) OVERRIDE;
122 virtual void TabReplacedAt(TabStripModel* tab_strip_model, 118 virtual void TabReplacedAt(TabStripModel* tab_strip_model,
123 content::WebContents* old_contents, 119 content::WebContents* old_contents,
124 content::WebContents* new_contents, 120 content::WebContents* new_contents,
125 int index) OVERRIDE; 121 int index) OVERRIDE;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 content::NotificationRegistrar registrar_; 206 content::NotificationRegistrar registrar_;
211 PrefChangeRegistrar profile_pref_registrar_; 207 PrefChangeRegistrar profile_pref_registrar_;
212 PrefChangeRegistrar local_pref_registrar_; 208 PrefChangeRegistrar local_pref_registrar_;
213 209
214 DISALLOW_COPY_AND_ASSIGN(BrowserCommandController); 210 DISALLOW_COPY_AND_ASSIGN(BrowserCommandController);
215 }; 211 };
216 212
217 } // namespace chrome 213 } // namespace chrome
218 214
219 #endif // CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_ 215 #endif // CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.cc ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698