diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 21:09:08 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 21:09:08 +0000 |
| commit | 054545338db4f77d5e5f403a57df757b6f47be07 (patch) | |
| tree | fb6e9a6993522a802c45490423541cb8072e93f1 /chrome/browser/app_controller_mac.h | |
| parent | 04504c246dd88763f14933199feb80cde09fd258 (diff) | |
| download | chromium_src-054545338db4f77d5e5f403a57df757b6f47be07.zip chromium_src-054545338db4f77d5e5f403a57df757b6f47be07.tar.gz chromium_src-054545338db4f77d5e5f403a57df757b6f47be07.tar.bz2 | |
Make Mac menu code obey incognito availability.
BUG=170053
TEST=as in bug
Review URL: https://chromiumcodereview.appspot.com/11906008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.h')
| -rw-r--r-- | chrome/browser/app_controller_mac.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h index d23cac41..27f436b 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. |