diff options
Diffstat (limited to 'chrome/browser/cocoa/wrench_menu_controller.mm')
-rw-r--r-- | chrome/browser/cocoa/wrench_menu_controller.mm | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/chrome/browser/cocoa/wrench_menu_controller.mm b/chrome/browser/cocoa/wrench_menu_controller.mm index 4966157..11d40a2 100644 --- a/chrome/browser/cocoa/wrench_menu_controller.mm +++ b/chrome/browser/cocoa/wrench_menu_controller.mm @@ -63,6 +63,11 @@ class ZoomLevelObserver : public NotificationObserver { return self; } +- (void)setWrenchMenuModel:(WrenchMenuModel*)model { + wrench_model_ = model; + [self setModel:model->menu_model()]; +} + - (void)addItemToMenu:(NSMenu*)menu atIndex:(NSInteger)index fromModel:(menus::MenuModel*)model @@ -166,37 +171,7 @@ class ZoomLevelObserver : public NotificationObserver { } - (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]; - } + return wrench_model_; } // Fit the localized strings into the Cut/Copy/Paste control, then resize the |