Index: chrome/browser/ui/cocoa/browser_window_controller.mm |
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm |
index 134f305f7f408c30bc90275faa81226a6191ca3e..fbfa591d979a297f06b621bc97dd6936d663b9f3 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm |
@@ -15,6 +15,7 @@ |
#include "base/strings/sys_string_conversions.h" |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/app/chrome_command_ids.h" // IDC_* |
+#import "chrome/browser/app_controller_mac.h" |
#include "chrome/browser/bookmarks/bookmark_model_factory.h" |
#include "chrome/browser/bookmarks/chrome_bookmark_client.h" |
#include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" |
@@ -27,7 +28,6 @@ |
#include "chrome/browser/profiles/profile_info_cache.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/profiles/profiles_state.h" |
-#include "chrome/browser/signin/signin_ui_util.h" |
#include "chrome/browser/themes/theme_service.h" |
#include "chrome/browser/themes/theme_service_factory.h" |
#include "chrome/browser/translate/chrome_translate_client.h" |
@@ -210,33 +210,6 @@ using content::WebContents; |
return [BrowserWindowController browserWindowControllerForWindow:window]; |
} |
-+ (void)updateSigninItem:(id)signinItem |
- shouldShow:(BOOL)showSigninMenuItem |
- currentProfile:(Profile*)profile { |
- DCHECK([signinItem isKindOfClass:[NSMenuItem class]]); |
- NSMenuItem* signinMenuItem = static_cast<NSMenuItem*>(signinItem); |
- |
- // Look for a separator immediately after the menu item so it can be hidden |
- // or shown appropriately along with the signin menu item. |
- NSMenuItem* followingSeparator = nil; |
- NSMenu* menu = [signinItem menu]; |
- if (menu) { |
- NSInteger signinItemIndex = [menu indexOfItem:signinMenuItem]; |
- DCHECK_NE(signinItemIndex, -1); |
- if ((signinItemIndex + 1) < [menu numberOfItems]) { |
- NSMenuItem* menuItem = [menu itemAtIndex:(signinItemIndex + 1)]; |
- if ([menuItem isSeparatorItem]) { |
- followingSeparator = menuItem; |
- } |
- } |
- } |
- |
- base::string16 label = signin_ui_util::GetSigninMenuLabel(profile); |
- [signinMenuItem setTitle:l10n_util::FixUpWindowsStyleLabel(label)]; |
- [signinMenuItem setHidden:!showSigninMenuItem]; |
- [followingSeparator setHidden:!showSigninMenuItem]; |
-} |
- |
// Load the browser window nib and do any Cocoa-specific initialization. |
// Takes ownership of |browser|. Note that the nib also sets this controller |
// up as the window's delegate. |
@@ -1137,9 +1110,9 @@ using content::WebContents; |
case IDC_SHOW_SIGNIN: { |
Profile* original_profile = |
browser_->profile()->GetOriginalProfile(); |
- [BrowserWindowController updateSigninItem:item |
- shouldShow:enable |
- currentProfile:original_profile]; |
+ [AppController updateSigninItem:item |
+ shouldShow:enable |
+ currentProfile:original_profile]; |
break; |
} |
case IDC_BOOKMARK_PAGE: { |