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

Unified Diff: chrome/browser/app_controller_mac.h

Issue 11906008: Make Mac menu code obey incognito availability. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: adjust comment Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_controller_mac.h
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h
index d23cac41113ef58a8e713014b47e9561e0b9faf0..27f436b7be508a7c5676a643655229d8a40a5e00 100644
--- a/chrome/browser/app_controller_mac.h
+++ b/chrome/browser/app_controller_mac.h
@@ -13,6 +13,7 @@
#include "base/memory/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
+#include "base/prefs/public/pref_change_registrar.h"
#include "ui/base/work_area_watcher_observer.h"
class BookmarkMenuBridge;
@@ -72,6 +73,9 @@ class WorkAreaWatcherObserver;
// Observers that listen to the work area changes.
ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_;
+
+ scoped_ptr<PrefChangeRegistrar> profilePrefRegistrar_;
+ PrefChangeRegistrar localPrefRegistrar_;
}
@property(readonly, nonatomic) BOOL startupComplete;
@@ -86,11 +90,11 @@ class WorkAreaWatcherObserver;
// window closure from causing the application to quit.
- (void)stopTryingToTerminateApplication:(NSApplication*)app;
-// Returns true if there is not a modal window (either window- or application-
+// Returns true if there is a modal window (either window- or application-
// modal) blocking the active browser. Note that tab modal dialogs (HTTP auth
// sheets) will not count as blocking the browser. But things like open/save
// dialogs that are window modal will block the browser.
-- (BOOL)keyWindowIsNotModal;
+- (BOOL)keyWindowIsModal;
// Show the preferences window, or bring it to the front if it's already
// visible.
« no previous file with comments | « no previous file | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698