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

Unified Diff: chrome/browser/cocoa/extensions/browser_actions_controller.mm

Issue 3036040: Merge 54843 - [Mac] Integrate divider into browser-action overflow chevron.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/472/src/
Patch Set: Created 10 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/cocoa/extensions/chevron_menu_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/extensions/browser_actions_controller.mm
===================================================================
--- chrome/browser/cocoa/extensions/browser_actions_controller.mm (revision 54845)
+++ chrome/browser/cocoa/extensions/browser_actions_controller.mm (working copy)
@@ -14,6 +14,7 @@
#import "chrome/browser/cocoa/extensions/browser_action_button.h"
#import "chrome/browser/cocoa/extensions/browser_actions_container_view.h"
#import "chrome/browser/cocoa/extensions/extension_popup_controller.h"
+#import "chrome/browser/cocoa/extensions/chevron_menu_button.h"
#import "chrome/browser/cocoa/menu_button.h"
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_host.h"
@@ -775,7 +776,7 @@
return;
if (!chevronMenuButton_.get()) {
- chevronMenuButton_.reset([[MenuButton alloc] init]);
+ chevronMenuButton_.reset([[ChevronMenuButton alloc] init]);
[chevronMenuButton_ setBordered:NO];
[chevronMenuButton_ setShowsBorderOnlyWhileMouseInside:YES];
NSImage* chevronImage = nsimage_cache::ImageNamed(kOverflowChevronsName);
« no previous file with comments | « no previous file | chrome/browser/cocoa/extensions/chevron_menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698