[Mac] Remove extraneous Bookmarks menu from menu bar when running apps from launcher.

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2012 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/app_controller_mac.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 1562 matching lines @@
 
 - (void)windowChangedToProfile:(Profile*)profile {
   if (lastProfile_ == profile)
     return;
 
   // Before tearing down the menu controller bridges, return the history menu to
   // its initial state.
   if (historyMenuBridge_)
     historyMenuBridge_->ResetMenu();
 
-  // Rebuild the menus with the new profile.
+  // Rebuild the menus with the new profile. The bookmarks submenu is cached to
+  // avoid slowdowns when switching between profiles with large numbers of
+  // bookmarks. Before caching, store whether it is hidden, make the menu item
+  // visible, and restore its original hidden state after resetting the submenu.
+  // This works around an apparent AppKit bug where setting a *different* NSMenu
+  // submenu on a *hidden* menu item forces the item to become visible.
+  // See http://crbug/497813 for more details.

[Robert Sesek, 2015/09/04 17:33:06]

nit: https://crbug.com is the proper hostname to use. Just "crbug" does not
resolve.

[dominickn, 2015/09/05 00:34:02]

Done.

+  NSMenuItem* item = [[NSApp mainMenu] itemWithTag:IDC_BOOKMARKS_MENU];

[Robert Sesek, 2015/09/04 17:33:06]

naming: item is a bit vague. bookmarkItem is better.

[dominickn, 2015/09/05 00:34:02]

Done.

+  BOOL hidden = [item isHidden];
+  [item setHidden:NO];
   lastProfile_ = profile;
 
   auto it = profileBookmarkMenuBridgeMap_.find(profile->GetPath());
   if (it == profileBookmarkMenuBridgeMap_.end()) {
-    base::scoped_nsobject<NSMenu> submenu(
-        [[[[NSApp mainMenu] itemWithTag:IDC_BOOKMARKS_MENU] submenu] copy]);
+    base::scoped_nsobject<NSMenu> submenu([[item submenu] copy]);
     bookmarkMenuBridge_ = new BookmarkMenuBridge(profile, submenu);
     profileBookmarkMenuBridgeMap_[profile->GetPath()] = bookmarkMenuBridge_;
   } else {
     bookmarkMenuBridge_ = it->second;
   }
 
-  [[[NSApp mainMenu] itemWithTag:IDC_BOOKMARKS_MENU] setSubmenu:
-      bookmarkMenuBridge_->BookmarkMenu()];
   // No need to |BuildMenu| here.  It is done lazily upon menu access.
+  [item setSubmenu:bookmarkMenuBridge_->BookmarkMenu()];
+  // Reset the hidden state to the previously saved value.

[Robert Sesek, 2015/09/04 17:33:06]

Remove this comment, since it's obvious from the code.

[dominickn, 2015/09/05 00:34:02]

Done.

+  [item setHidden:hidden];
 
   historyMenuBridge_.reset(new HistoryMenuBridge(lastProfile_));
   historyMenuBridge_->BuildMenu();
 
   chrome::BrowserCommandController::
       UpdateSharedCommandsForIncognitoAvailability(
           menuState_.get(), lastProfile_);
   profilePrefRegistrar_.reset(new PrefChangeRegistrar());
   profilePrefRegistrar_->Init(lastProfile_->GetPrefs());
   profilePrefRegistrar_->Add(
@@ skipping 103 matching lines @@
 
 //---------------------------------------------------------------------------
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac