chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc - Issue 10905005: Change browser/page action default icon defined in manifest to support hidpi.

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_as_browser_action_apitest.cc

Issue 10905005: Change browser/page action default icon defined in manifest to support hidpi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: disable unittest on android Created 8 years, 3 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/page_action_apitest.cc ('k') | chrome/browser/extensions/extension_action_icon_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 95136cdd506783eecbd1105e92794c5ecaa16ab9..53dfcb7cf3400f50ffa33eb5d83d2bc555760d03 100644

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

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

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

#include "base/command_line.h"

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

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

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

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

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

@@ -93,8 +94,12 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, Basic) {

ASSERT_TRUE(catcher.GetNextResult());

}

+ // We should not be creating icons asynchronously, so we don't need an

+ // observer.

+ ExtensionActionIconFactory icon_factory(extension, action, NULL);

// Test that we received the changes.

- EXPECT_FALSE(action->GetIcon(tab_id).IsEmpty());

+ EXPECT_FALSE(icon_factory.GetIcon(tab_id).IsEmpty());

}

// Test that calling chrome.pageAction.setPopup() can enable a popup.