Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Side by Side Diff: chrome/browser/cocoa/toolbar_controller.mm

Issue 3139003: Merge 55568 - [Mac] Insert the Update Chrome item to existing Wrench menus wh... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/472/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/cocoa/wrench_menu_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/cocoa/toolbar_controller.h" 5 #import "chrome/browser/cocoa/toolbar_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/l10n_util_mac.h" 9 #include "app/l10n_util_mac.h"
10 #include "app/menus/accelerator_cocoa.h" 10 #include "app/menus/accelerator_cocoa.h"
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 [[NSImage alloc] initWithSize:wrenchImageSize]); 562 [[NSImage alloc] initWithSize:wrenchImageSize]);
563 563
564 [overlayImage lockFocus]; 564 [overlayImage lockFocus];
565 [badge drawAtPoint:NSZeroPoint 565 [badge drawAtPoint:NSZeroPoint
566 fromRect:NSZeroRect 566 fromRect:NSZeroRect
567 operation:NSCompositeSourceOver 567 operation:NSCompositeSourceOver
568 fraction:1.0]; 568 fraction:1.0];
569 [overlayImage unlockFocus]; 569 [overlayImage unlockFocus];
570 570
571 [[wrenchButton_ cell] setOverlayImage:overlayImage]; 571 [[wrenchButton_ cell] setOverlayImage:overlayImage];
572
573 [wrenchMenuController_ insertUpdateAvailableItem];
572 } 574 }
573 575
574 - (void)prefChanged:(std::wstring*)prefName { 576 - (void)prefChanged:(std::wstring*)prefName {
575 if (!prefName) return; 577 if (!prefName) return;
576 if (*prefName == prefs::kShowHomeButton) { 578 if (*prefName == prefs::kShowHomeButton) {
577 [self showOptionalHomeButton]; 579 [self showOptionalHomeButton];
578 } 580 }
579 } 581 }
580 582
581 - (void)createBrowserActionButtons { 583 - (void)createBrowserActionButtons {
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { 784 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
783 // Do nothing. 785 // Do nothing.
784 } 786 }
785 787
786 // (URLDropTargetController protocol) 788 // (URLDropTargetController protocol)
787 - (void)hideDropURLsIndicatorInView:(NSView*)view { 789 - (void)hideDropURLsIndicatorInView:(NSView*)view {
788 // Do nothing. 790 // Do nothing.
789 } 791 }
790 792
791 @end 793 @end
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/cocoa/wrench_menu_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698