diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 18:26:19 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 18:26:19 +0000 |
| commit | 9b3bd7911f8d31677ba7d8f81d2e41ff1115b2ed (patch) | |
| tree | 9540743367e5839f1547be924b4e73635cff7880 /chrome/browser/browser.cc | |
| parent | 23e5795717a137035d01c4b5044f005f55b61ce6 (diff) | |
| download | chromium_src-9b3bd7911f8d31677ba7d8f81d2e41ff1115b2ed.zip chromium_src-9b3bd7911f8d31677ba7d8f81d2e41ff1115b2ed.tar.gz chromium_src-9b3bd7911f8d31677ba7d8f81d2e41ff1115b2ed.tar.bz2 | |
Mac: temporarily disable Full Screen and Task Manager.
We need to do it in Browser, since the new common menu code (for the App and
Page menus) doesn't look to the BrowserWindowController for their enabled
status.
BUG=31768
TEST=On Mac, make sure the Full Screen and Task Manager menu items are disabled in both the main menu and in the App and Page menus. On other platforms, make sure they still work as usual.
Review URL: http://codereview.chromium.org/518085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index ce931cc..91f0101 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -2480,7 +2480,11 @@ void Browser::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_NEW_TAB, true); command_updater_.UpdateCommandEnabled(IDC_CLOSE_TAB, true); command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB, true); +// TODO(viettrungluu): Temporarily disabled on Mac. Must disable here (not in +// BWC) so that it also affects the wrench menu. http://crbug.com/31638 +#if !defined(OS_MACOSX) command_updater_.UpdateCommandEnabled(IDC_FULLSCREEN, true); +#endif command_updater_.UpdateCommandEnabled(IDC_EXIT, true); #if defined(TOOLKIT_VIEWS) command_updater_.UpdateCommandEnabled(IDC_COMPACT_NAVBAR, true); @@ -2551,7 +2555,11 @@ void Browser::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false); command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, true); command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, true); +// TODO(viettrungluu): Temporarily disabled on Mac. Must disable here (not in +// BWC) so that it also affects the page menu. http://crbug.com/13156 +#if !defined(OS_MACOSX) command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true); +#endif command_updater_.UpdateCommandEnabled(IDC_SELECT_PROFILE, true); command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true); command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true); |