Merge 55568 - [Mac] Insert the Update Chrome item to existing Wrench menus wh...

chrome/browser/cocoa/wrench_menu_controller.mm

 // Copyright (c) 2010 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/cocoa/wrench_menu_controller.h"
 
+#include "app/l10n_util.h"
 #include "app/menus/menu_model.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
 #include "chrome/browser/wrench_menu_model.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
 
 @interface WrenchMenuController (Private)
 - (WrenchMenuModel*)wrenchMenuModel;
 - (void)adjustPositioning;
 @end
 
 @implementation WrenchMenuController
 
 - (id)init {
   self = [super init];
@@ skipping 79 matching lines @@
   // TODO(rsesek): It'd be great if the zoom buttons didn't have to close the
   // menu. See http://crbug.com/48679 for more info.
   [menu_ cancelTracking];
   [self wrenchMenuModel]->ExecuteCommand(tag);
 }
 
 - (WrenchMenuModel*)wrenchMenuModel {
   return static_cast<WrenchMenuModel*>(model_);
 }
 
+// Inserts the update available notification menu item.
+- (void)insertUpdateAvailableItem {
+  WrenchMenuModel* model = [self wrenchMenuModel];
+  // Don't insert the item multiple times.
+  if (!model || model->GetIndexOfCommandId(IDC_ABOUT) != -1)
+    return;
+
+  // Update the model manually because the model is static because other
+  // platforms always have an About item.
+  int index = model->GetIndexOfCommandId(IDC_OPTIONS) + 1;
+  model->InsertItemAt(index, IDC_ABOUT,
+                      l10n_util::GetStringFUTF16(IDS_ABOUT,
+                          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+
+  // The model does not broadcast change notifications to its delegate, so
+  // insert the actual menu item ourselves.
+  NSInteger menuIndex = [[self menu] indexOfItemWithTag:index];
+  [self addItemToMenu:[self menu]
+              atIndex:menuIndex
+            fromModel:model
+           modelIndex:index];
+
+  // Since the tag of each menu item is the index within the model, they need
+  // to be adjusted after insertion.
+  for (NSInteger i = menuIndex + 1; i < [[self menu] numberOfItems]; ++i) {
+    NSMenuItem* item = [[self menu] itemAtIndex:i];
+    [item setTag:[item tag] + 1];
+  }
+}
+
 // Fit the localized strings into the Cut/Copy/Paste control, then resize the
 // whole menu item accordingly.
 - (void)adjustPositioning {
   NSRect itemFrame = [editItem_ frame];
   NSRect controlFrame = [editControl_ frame];
 
   CGFloat originalControlWidth = NSWidth(controlFrame);
   // Maintain the carefully pixel-pushed gap between the edge of the menu and
   // the rightmost control.
   CGFloat edge = NSWidth(itemFrame) -
       (controlFrame.origin.x + originalControlWidth);
 
   // Resize the edit segmented control to fit the localized strings.
   [editControl_ sizeToFit];
   controlFrame = [editControl_ frame];
   CGFloat resizeAmount = NSWidth(controlFrame) - originalControlWidth;
 
   // Adjust the size of the entire menu item to account for changes in the size
   // of the segmented control.
   itemFrame.size.width += resizeAmount;
   [editItem_ setFrame:itemFrame];
 
   // Keep the spacing between the right edges of the menu and the control.
   controlFrame.origin.x = NSWidth(itemFrame) - edge - NSWidth(controlFrame);
   [editControl_ setFrame:controlFrame];
 }
 
 @end  // @implementation WrenchMenuController