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

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

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 (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 <vector> 8 #include <vector>
9 9
10 #include "base/prefs/pref_change_registrar.h" 10 #include "base/prefs/pref_change_registrar.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 static void UpdateSharedCommandsForIncognitoAvailability( 73 static void UpdateSharedCommandsForIncognitoAvailability(
74 CommandUpdater* command_updater, 74 CommandUpdater* command_updater,
75 Profile* profile); 75 Profile* profile);
76 76
77 private: 77 private:
78 class InterstitialObserver; 78 class InterstitialObserver;
79 79
80 // Overridden from CommandUpdaterDelegate: 80 // Overridden from CommandUpdaterDelegate:
81 virtual void ExecuteCommandWithDisposition( 81 virtual void ExecuteCommandWithDisposition(
82 int id, 82 int id,
83 WindowOpenDisposition disposition) OVERRIDE; 83 WindowOpenDisposition disposition) override;
84 84
85 // Overridden from TabStripModelObserver: 85 // Overridden from TabStripModelObserver:
86 virtual void TabInsertedAt(content::WebContents* contents, 86 virtual void TabInsertedAt(content::WebContents* contents,
87 int index, 87 int index,
88 bool foreground) OVERRIDE; 88 bool foreground) override;
89 virtual void TabDetachedAt(content::WebContents* contents, 89 virtual void TabDetachedAt(content::WebContents* contents,
90 int index) OVERRIDE; 90 int index) override;
91 virtual void TabReplacedAt(TabStripModel* tab_strip_model, 91 virtual void TabReplacedAt(TabStripModel* tab_strip_model,
92 content::WebContents* old_contents, 92 content::WebContents* old_contents,
93 content::WebContents* new_contents, 93 content::WebContents* new_contents,
94 int index) OVERRIDE; 94 int index) override;
95 virtual void TabBlockedStateChanged(content::WebContents* contents, 95 virtual void TabBlockedStateChanged(content::WebContents* contents,
96 int index) OVERRIDE; 96 int index) override;
97 97
98 // Overridden from TabRestoreServiceObserver: 98 // Overridden from TabRestoreServiceObserver:
99 virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE; 99 virtual void TabRestoreServiceChanged(TabRestoreService* service) override;
100 virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE; 100 virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override;
101 virtual void TabRestoreServiceLoaded(TabRestoreService* service) OVERRIDE; 101 virtual void TabRestoreServiceLoaded(TabRestoreService* service) override;
102 102
103 // Returns true if the regular Chrome UI (not the fullscreen one and 103 // Returns true if the regular Chrome UI (not the fullscreen one and
104 // not the single-tab one) is shown. Used for updating window command states 104 // not the single-tab one) is shown. Used for updating window command states
105 // only. Consider using SupportsWindowFeature if you need the mentioned 105 // only. Consider using SupportsWindowFeature if you need the mentioned
106 // functionality anywhere else. 106 // functionality anywhere else.
107 bool IsShowingMainUI(); 107 bool IsShowingMainUI();
108 108
109 // Initialize state for all browser commands. 109 // Initialize state for all browser commands.
110 void InitCommandState(); 110 void InitCommandState();
111 111
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 PrefChangeRegistrar profile_pref_registrar_; 187 PrefChangeRegistrar profile_pref_registrar_;
188 PrefChangeRegistrar local_pref_registrar_; 188 PrefChangeRegistrar local_pref_registrar_;
189 BooleanPrefMember pref_signin_allowed_; 189 BooleanPrefMember pref_signin_allowed_;
190 190
191 DISALLOW_COPY_AND_ASSIGN(BrowserCommandController); 191 DISALLOW_COPY_AND_ASSIGN(BrowserCommandController);
192 }; 192 };
193 193
194 } // namespace chrome 194 } // namespace chrome
195 195
196 #endif // CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_ 196 #endif // CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_close_browsertest.cc ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698