diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-20 23:12:25 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-20 23:12:25 +0000 |
| commit | c065fa073f614eafdc3af5a69374ef9510ca3259 (patch) | |
| tree | bec9d330a04f43cfb079f37201decfb76312df8b /chrome/browser/browser.cc | |
| parent | 4a5bbf82f2e1f3c9f54f7a8bdf9c4ee886000a41 (diff) | |
| download | chromium_src-c065fa073f614eafdc3af5a69374ef9510ca3259.zip chromium_src-c065fa073f614eafdc3af5a69374ef9510ca3259.tar.gz chromium_src-c065fa073f614eafdc3af5a69374ef9510ca3259.tar.bz2 | |
Disable app mode in the model on Mac so it is disabled in the page menu.
BUG=32559
TEST=menu item should be disabled on mac, enabled on win/linux
Review URL: http://codereview.chromium.org/552070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36695 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 7ccdaf5..f06aefc 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -2674,8 +2674,12 @@ void Browser::UpdateCommandsForTabState() { enabled_for_non_devtools); // Show various bits of UI + // TODO(pinkerton): Disable app-mode in the model until we implement it + // on the Mac. Be sure to remove both ifdefs. http://crbug.com/13148 +#if !defined(OS_MACOSX) command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, web_app::IsValidUrl(current_tab->GetURL())); +#endif command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION, current_tab->ShouldDisplayURL() && current_tab->GetURL().is_valid()); } @@ -2790,8 +2794,12 @@ void Browser::ProcessPendingUIUpdates() { if (flags & (TabContents::INVALIDATE_TAB | TabContents::INVALIDATE_TITLE)) { +// TODO(pinkerton): Disable app-mode in the model until we implement it +// on the Mac. Be sure to remove both ifdefs. http://crbug.com/13148 +#if !defined(OS_MACOSX) command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, web_app::IsValidUrl(contents->GetURL())); +#endif window_->UpdateTitleBar(); } } |