chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm - Issue 1241063003: Support Component Actions in the toolbar.

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_button_interactive_uitest.mm

Issue 1241063003: Support Component Actions in the toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 5 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 | « chrome/browser/extensions/extension_toolbar_model_unittest.cc ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('j') | chrome/browser/ui/toolbar/toolbar_actions_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 55149f31f3c1cc25dd0412b32de4ee0eed1bf768..073e8fd5cb8ed579b2686467b67af687b0921f75 100644

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

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

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

#include "chrome/browser/extensions/extension_action_test_util.h"

#include "chrome/browser/extensions/extension_browsertest.h"

#include "chrome/browser/extensions/extension_service.h"

-#include "chrome/browser/extensions/extension_toolbar_model.h"

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

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

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

@@ -17,6 +16,7 @@

#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_actions_bar.h"

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

#include "chrome/test/base/interactive_test_utils.h"

#include "extensions/common/feature_switch.h"

#import "ui/events/test/cocoa_test_event_utils.h"

@@ -161,8 +161,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionButtonUiTest,

"browser_action",

extensions::extension_action_test_util::BROWSER_ACTION);

extension_service()->AddExtension(extension.get());

- extensions::ExtensionToolbarModel* model =

- extensions::ExtensionToolbarModel::Get(profile());

+ ToolbarActionsModel* model = ToolbarActionsModel::Get(profile());

ASSERT_EQ(1u, model->toolbar_items().size());

ToolbarController* toolbarController =