chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc - 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/extensions/api/extension_action/browser_action_interactive_test.cc

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

Patch Set: Changes per mfoltz@'s comments. Created 5 years, 4 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/api/extension_action/browser_action_apitest.cc ('k') | chrome/browser/extensions/api/extension_action/extension_action_api.cc » ('j') | chrome/browser/extensions/extension_action_test_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc

diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc

index 8d1b3225ea113279e6f65344445e854f23c2c38c..66cfc28bdd9f06dfa82f03e5cdeefdc29bfc50f6 100644

--- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc

+++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc

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

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

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

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

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

#include "chrome/browser/sessions/session_tab_helper.h"

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

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

@@ -15,6 +14,7 @@

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

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

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

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

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

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

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

@@ -102,7 +102,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, TestOpenPopup) {

ui::PAGE_TRANSITION_TYPED, false)));

// Hide all the buttons to test that it opens even when the browser action

// is in the overflow bucket.

- extensions::ExtensionToolbarModel::Get(profile())->SetVisibleIconCount(0);

+ ToolbarActionsModel::Get(profile())->SetVisibleIconCount(0);

frame_observer.Wait();

}