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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm

Issue 1508853008: chrome: rename more wrench/Wrench occurrencies to appMenu/AppMenu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix updateAppButtonSeverity and rewrap + rebase Created 5 years 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "chrome/browser/ui/browser_window.h" 5 #include "chrome/browser/ui/browser_window.h"
6 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 6 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
7 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" 7 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
8 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 8 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
9 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h" 9 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
10 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 10 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 ToolbarController* toolbarController = ToolbarControllerForBrowser(browser); 89 ToolbarController* toolbarController = ToolbarControllerForBrowser(browser);
90 BrowserActionsController* actionsController = 90 BrowserActionsController* actionsController =
91 [toolbarController browserActionsController]; 91 [toolbarController browserActionsController];
92 NSView* anchorView = nil; 92 NSView* anchorView = nil;
93 ToolbarActionsBarBubbleMac* bubble = [actionsController activeBubble]; 93 ToolbarActionsBarBubbleMac* bubble = [actionsController activeBubble];
94 switch (anchor) { 94 switch (anchor) {
95 case ANCHOR_BROWSER_ACTION: 95 case ANCHOR_BROWSER_ACTION:
96 anchorView = [actionsController buttonWithIndex:0]; 96 anchorView = [actionsController buttonWithIndex:0];
97 break; 97 break;
98 case ANCHOR_APP_MENU: 98 case ANCHOR_APP_MENU:
99 anchorView = [toolbarController wrenchButton]; 99 anchorView = [toolbarController appMenuButton];
100 break; 100 break;
101 } 101 }
102 CheckBubbleAndReferenceView(bubble, anchorView); 102 CheckBubbleAndReferenceView(bubble, anchorView);
103 } 103 }
104 104
105 void ExtensionMessageBubbleBrowserTestMac::CloseBubble(Browser* browser) { 105 void ExtensionMessageBubbleBrowserTestMac::CloseBubble(Browser* browser) {
106 BrowserActionsController* controller = 106 BrowserActionsController* controller =
107 [ToolbarControllerForBrowser(browser) browserActionsController]; 107 [ToolbarControllerForBrowser(browser) browserActionsController];
108 ToolbarActionsBarBubbleMac* bubble = [controller activeBubble]; 108 ToolbarActionsBarBubbleMac* bubble = [controller activeBubble];
109 ASSERT_TRUE(bubble); 109 ASSERT_TRUE(bubble);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac, 142 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
143 ExtensionBubbleShowsOnStartup) { 143 ExtensionBubbleShowsOnStartup) {
144 TestBubbleShowsOnStartup(); 144 TestBubbleShowsOnStartup();
145 } 145 }
146 146
147 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac, 147 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
148 TestUninstallDangerousExtension) { 148 TestUninstallDangerousExtension) {
149 TestUninstallDangerousExtension(); 149 TestUninstallDangerousExtension();
150 } 150 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698