[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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95568 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/browser.cc

@@ -3771,7 +3771,7 @@ void Browser::OnStateChanged() {
 #endif
 
   command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS,
-      show_main_ui && profile_->IsSyncAccessible());
+      show_main_ui && profile_->GetOriginalProfile()->IsSyncAccessible());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -4039,7 +4039,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);

chrome/browser/ui/cocoa/browser_window_controller.mm

@@ -1049,10 +1049,13 @@ enum {
           }
           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