chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc - Issue 882243002: [Extensions] Make extension actions use gfx::Image over gfx::ImageSkia.

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/declarative_content/set_icon_apitest.cc

Issue 882243002: [Extensions] Make extension actions use gfx::Image over gfx::ImageSkia. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master Created 5 years, 11 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/content_action_unittest.cc ('k') | chrome/browser/extensions/extension_action.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc

diff --git a/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc b/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc

index 070006ea1d52550c357ff33b9aaca3aa3af3bc38..95d22225cffe85f736846738327d606c139bd3da 100644

--- a/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc

+++ b/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc

@@ -9,7 +9,7 @@

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

#include "chrome/common/extensions/features/feature_channel.h"

#include "extensions/test/extension_test_message_listener.h"

-#include "ui/gfx/image/image_skia.h"

+#include "ui/gfx/image/image.h"

namespace extensions {

namespace {

@@ -84,13 +84,13 @@ IN_PROC_BROWSER_TEST_F(SetIconAPITest, Overview) {

const int tab_id = ExtensionTabUtil::GetTabId(tab);

// There should be no declarative icon until we navigate to a matched page.

- EXPECT_TRUE(page_action->GetDeclarativeIcon(tab_id).bitmap()->empty());

+ EXPECT_TRUE(page_action->GetDeclarativeIcon(tab_id).IsEmpty());

NavigateInRenderer(tab, GURL("http://test1/"));

- EXPECT_FALSE(page_action->GetDeclarativeIcon(tab_id).bitmap()->empty());

+ EXPECT_FALSE(page_action->GetDeclarativeIcon(tab_id).IsEmpty());

// Navigating to an unmatched page should reset the icon.

NavigateInRenderer(tab, GURL("http://test2/"));

- EXPECT_TRUE(page_action->GetDeclarativeIcon(tab_id).bitmap()->empty());

+ EXPECT_TRUE(page_action->GetDeclarativeIcon(tab_id).IsEmpty());

}

} // namespace

} // namespace extensions