[Sync] [Mac] Show sync menu item in app menu even in incognito mode

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include <cmath>
 #include <numeric>
@@ skipping 1005 matching lines @@
         case IDC_FULLSCREEN: {
           enable &= [self supportsFullscreen];
           if ([static_cast<NSObject*>(item) isKindOfClass:[NSMenuItem class]]) {
             NSString* menuTitle = l10n_util::GetNSString(
                 [self isFullscreen] ? IDS_EXIT_FULLSCREEN_MAC :
                                       IDS_ENTER_FULLSCREEN_MAC);
             [static_cast<NSMenuItem*>(item) setTitle:menuTitle];
           }
           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);

[Scott Hess - ex-Googler, 2011/08/04 22:28:20]

The only other place UpdateSyncItem() is called from is in
app_controller_mac.mm.  AFAICT my other fix will handle it, but I can't think of
any reason not to push the GetOriginalProfile() and IsSyncAccessible() calls
down into UpdateSyncItem().

           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
           // enable/disable the submenu's contents (per Apple's HIG).
           EncodingMenuController encoding_controller;
           if (encoding_controller.DoesCommandBelongToEncodingMenu(tag)) {
             enable &= browser_->command_updater()->IsCommandEnabled(
                 IDC_ENCODING_MENU) ? YES : NO;
           }
       }
@@ skipping 1279 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)