diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 00:07:27 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 00:07:27 +0000 |
| commit | 78fbe91576ec92b6862f0b44da55f549ec210266 (patch) | |
| tree | 3fb708dc90b298de39fb8f63edf2fa4debff7aea | |
| parent | ee585f439275d9361c6dbf1124fd31f1c36f1ac9 (diff) | |
| download | chromium_src-78fbe91576ec92b6862f0b44da55f549ec210266.zip chromium_src-78fbe91576ec92b6862f0b44da55f549ec210266.tar.gz chromium_src-78fbe91576ec92b6862f0b44da55f549ec210266.tar.bz2 | |
Merge 95568 - [Sync] [Mac] Show sync menu item in app menu even in incognito mode
BUG=91682
TEST=Open Chrome, open incognito window, check app menu to make sure there is an item for sync
Review URL: http://codereview.chromium.org/7511024
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/7598022
git-svn-id: svn://svn.chromium.org/chrome/branches/835/src@95917 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/browser.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_window_controller.mm | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index b24a20e..be1c982 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -3739,7 +3739,7 @@ void Browser::OnStateChanged() { #endif command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS, - show_main_ui && profile_->IsSyncAccessible()); + show_main_ui && profile_->GetOriginalProfile()->IsSyncAccessible()); } /////////////////////////////////////////////////////////////////////////////// @@ -4007,7 +4007,7 @@ void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) { browser_defaults::bookmarks_enabled && show_main_ui); command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui); command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS, - show_main_ui && profile_->IsSyncAccessible()); + show_main_ui && profile_->GetOriginalProfile()->IsSyncAccessible()); command_updater_.UpdateCommandEnabled(IDC_OPTIONS, show_main_ui); command_updater_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, show_main_ui); diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index be6845e..ac27d0d 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -1021,10 +1021,13 @@ typedef NSInteger NSWindowAnimationBehavior; } break; } - case IDC_SYNC_BOOKMARKS: - enable &= browser_->profile()->IsSyncAccessible(); - sync_ui_util::UpdateSyncItem(item, enable, browser_->profile()); + case IDC_SYNC_BOOKMARKS: { + Profile* original_profile = + browser_->profile()->GetOriginalProfile(); + enable &= original_profile->IsSyncAccessible(); + sync_ui_util::UpdateSyncItem(item, enable, original_profile); break; + } default: // Special handling for the contents of the Text Encoding submenu. On // Mac OS, instead of enabling/disabling the top-level menu item, we |