chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.mm - Issue 1419993010: chrome: Rename WrenchMenuController to AppMenuController.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.mm

Issue 1419993010: chrome: Rename WrenchMenuController to AppMenuController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixes Created 5 years, 1 month 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

« chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm ('K') | « chrome/browser/ui/cocoa/global_error_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.mm b/chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.mm

index 81927272faddb4185fececdbcbb4252ae0523a2c..128a46115afc5b44baedb17af6725332eed5b222 100644

--- a/chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.mm

+++ b/chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.mm

@@ -7,9 +7,9 @@

#include "base/logging.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_window.h"

+#import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"

#import "chrome/browser/ui/cocoa/browser_window_controller.h"

#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

-#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"

// static

scoped_ptr<MediaRouterActionPlatformDelegate>

@@ -31,14 +31,14 @@ MediaRouterActionPlatformDelegateCocoa::

bool MediaRouterActionPlatformDelegateCocoa::CloseOverflowMenuIfOpen() {

// TODO(apacible): This should be factored to share code with extension

// actions.

- WrenchMenuController* wrenchMenuController =

+ AppMenuController* appMenuController =

[[[BrowserWindowController

browserWindowControllerForWindow:

browser_->window()->GetNativeWindow()]

- toolbarController] wrenchMenuController];

- if (![wrenchMenuController isMenuOpen])

+ toolbarController] appMenuController];

+ if (![appMenuController isMenuOpen])

return false;

- [wrenchMenuController cancel];

+ [appMenuController cancel];

return true;

}