chrome/browser/extensions/api/extension_action/page_action_apitest.cc - Issue 516633002: Stop showing page actions in the location bar with redesign enabled

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/page_action_apitest.cc

Issue 516633002: Stop showing page actions in the location bar with redesign enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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/declarative_content/declarative_content_apitest.cc ('k') | chrome/browser/extensions/extension_action_test_util.h » ('j') | chrome/browser/extensions/extension_action_test_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 62bf48f981b40f63c617ebf3232d9af2cc3cb3a8..3cefd0b00d2aca8283f499d638feb01a45f6c667 100644

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -168,9 +168,8 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, DISABLED_ShowPageActionPopup) {

{

ResultCatcher catcher;

- LocationBarTesting* location_bar =

- browser()->window()->GetLocationBar()->GetLocationBarForTesting();

- location_bar->TestPageActionPressed(0);

+ ExtensionActionAPI::Get(browser()->profile())->ShowExtensionActionPopup(

+ extension, browser(), true);

ASSERT_TRUE(catcher.GetNextResult());

}