chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm - Issue 670463004: Make a platform-independent ToolbarActionViewController

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/extensions/browser_action_test_util_mac.mm

Issue 670463004: Make a platform-independent ToolbarActionViewController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/browser_action_button.mm ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d1907253a0c774ff7aa60f4f719d5eb20af391df..94e32282a3113450674110cfed6338e3386ad474 100644

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

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

@@ -7,6 +7,7 @@

#include "base/mac/foundation_util.h"

#include "base/strings/sys_string_conversions.h"

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

+#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"

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

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

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

@@ -64,7 +65,7 @@ void BrowserActionTestUtil::Press(int index) {

}

std::string BrowserActionTestUtil::GetExtensionId(int index) {

- return [GetButton(browser_, index) extension]->id();

+ return [GetButton(browser_, index) viewController]->GetId();

}

std::string BrowserActionTestUtil::GetTooltip(int index) {