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

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

Issue 10879066: Revert 153205 - Temporarily revert 152729 - Revert "Fixing crash Crash Report - Stack Signature: co… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/api/prefs/pref_change_registrar.h" 8 #include "chrome/browser/api/prefs/pref_change_registrar.h"
9 #include "chrome/browser/command_updater.h" 9 #include "chrome/browser/command_updater.h"
10 #include "chrome/browser/sessions/tab_restore_service_observer.h" 10 #include "chrome/browser/sessions/tab_restore_service_observer.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 void UpdateReloadStopState(bool is_loading, bool force); 154 void UpdateReloadStopState(bool is_loading, bool force);
155 155
156 // Add/remove observers for interstitial attachment/detachment from 156 // Add/remove observers for interstitial attachment/detachment from
157 // |contents|. 157 // |contents|.
158 void AddInterstitialObservers(TabContents* contents); 158 void AddInterstitialObservers(TabContents* contents);
159 void RemoveInterstitialObservers(TabContents* contents); 159 void RemoveInterstitialObservers(TabContents* contents);
160 160
161 inline BrowserWindow* window(); 161 inline BrowserWindow* window();
162 inline Profile* profile(); 162 inline Profile* profile();
163 163
164 // Check if any window is open in full screen mode.
165 bool IsFullScreenWindowOpen();
166
167 Browser* browser_; 164 Browser* browser_;
168 165
169 // The CommandUpdater that manages the browser window commands. 166 // The CommandUpdater that manages the browser window commands.
170 CommandUpdater command_updater_; 167 CommandUpdater command_updater_;
171 168
172 // Indicates if command execution is blocked. 169 // Indicates if command execution is blocked.
173 bool block_command_execution_; 170 bool block_command_execution_;
174 171
175 // Stores the last blocked command id when |block_command_execution_| is true. 172 // Stores the last blocked command id when |block_command_execution_| is true.
176 int last_blocked_command_id_; 173 int last_blocked_command_id_;
177 174
178 // Stores the disposition type of the last blocked command. 175 // Stores the disposition type of the last blocked command.
179 WindowOpenDisposition last_blocked_command_disposition_; 176 WindowOpenDisposition last_blocked_command_disposition_;
180 177
181 content::NotificationRegistrar registrar_; 178 content::NotificationRegistrar registrar_;
182 PrefChangeRegistrar profile_pref_registrar_; 179 PrefChangeRegistrar profile_pref_registrar_;
183 PrefChangeRegistrar local_pref_registrar_; 180 PrefChangeRegistrar local_pref_registrar_;
184 181
185 DISALLOW_COPY_AND_ASSIGN(BrowserCommandController); 182 DISALLOW_COPY_AND_ASSIGN(BrowserCommandController);
186 }; 183 };
187 184
188 } // namespace chrome 185 } // namespace chrome
189 186
190 #endif // CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_ 187 #endif // CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698