Makes bookmark menu lazily create menus and removes limits

chrome/browser/ui/toolbar/wrench_menu_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
@@ skipping 112 matching lines @@
 
 // A menu model that builds the contents of the wrench menu.
 class WrenchMenuModel : public ui::SimpleMenuModel,
                         public ui::SimpleMenuModel::Delegate,
                         public ui::ButtonMenuItemModel::Delegate,
                         public TabStripModelObserver,
                         public content::NotificationObserver {
  public:
   // Range of command ID's to use for the items representing bookmarks in the
   // bookmark menu, must not overlap with that for recent tabs submenu.
-  static const int kMinBookmarkCommandId = 1;
-  static const int kMaxBookmarkCommandId = 1000;
+  // NOTE: this starts at 0xF000 as Chrome does not assign any ids in that
+  // range. ids >= 0xF000 are problematic if exposed to Windows, but these
+  // ids aren't exposed to the system.

[Peter Kasting, 2015/03/25 21:31:29]

Is it possible to define these values in chrome/app/chrome_command_ids.h or a
similar file that defines our other command IDs?  The idea of doing that would
be to make it more obvious that this range is in use, in case someone else tries
to add IDs there later.

(I don't know how many different files exist to reserve these different ranges
and if there's a better place for this.  For the same reason, I don't know if
there's something preventing you from using 0xD000 and up instead of 0xF000.)

[sky, 2015/03/30 20:46:35]

Done.

+  static const int kMinBookmarkCommandId = 0xF000;
+  static const int kMaxBookmarkCommandId = 0xF000 + 10000;

[Peter Kasting, 2015/03/25 21:31:29]

Can this use kMinBookmarkCommandId instead of repeating 0xF000?

[sky, 2015/03/30 20:46:35]

I've nuked the defines here entirely.

 
   // Range of command ID's to use for the items in the recent tabs submenu, must
   // not overlap with that for bookmarks.
   static const int kMinRecentTabsCommandId = 1001;
   static const int kMaxRecentTabsCommandId = 1200;
 
   WrenchMenuModel(ui::AcceleratorProvider* provider, Browser* browser);
   ~WrenchMenuModel() override;
 
   // Overridden for ButtonMenuItemModel::Delegate:
@@ skipping 105 matching lines @@
   Browser* browser_;  // weak
   TabStripModel* tab_strip_model_; // weak
 
   scoped_ptr<content::HostZoomMap::Subscription> browser_zoom_subscription_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_