chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm - Issue 1419993010: chrome: Rename WrenchMenuController to AppMenuController.

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_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/browser_action_button_interactive_uitest.mm ('K') | « chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm ('k') | chrome/browser/ui/cocoa/global_error_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm b/chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm

index 1de9d70c60b504eafc70d9ba8846139f66935a27..0bb76bab89abce1039da62d746d0752efca41a95 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm

@@ -12,12 +12,12 @@

#include "chrome/browser/extensions/extension_view_host.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/extensions/browser_actions_controller.h"

#import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"

#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

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

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

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

#include "chrome/common/extensions/api/extension_action/action_info.h"

#include "content/public/browser/notification_details.h"

@@ -81,15 +81,15 @@ void ExtensionActionPlatformDelegateCocoa::ShowPopup(

}

void ExtensionActionPlatformDelegateCocoa::CloseOverflowMenu() {

- // If this was triggered by an action overflowed to the wrench menu, then

- // the wrench menu will be open. Close it before opening the popup.

- WrenchMenuController* wrenchMenuController =

+ // If this was triggered by an action overflowed to the app menu, then

Peter Kasting 2015/11/06 22:21:28 Nit: Rewrap comment

+ // the app menu will be open. Close it before opening the popup.

+ AppMenuController* appMenuController =

[[[BrowserWindowController

browserWindowControllerForWindow:

controller_->browser()->window()->GetNativeWindow()]

- toolbarController] wrenchMenuController];

- if ([wrenchMenuController isMenuOpen])

- [wrenchMenuController cancel];

+ toolbarController] appMenuController];

+ if ([appMenuController isMenuOpen])

+ [appMenuController cancel];

}

NSPoint ExtensionActionPlatformDelegateCocoa::GetPopupPoint() const {