chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc - Issue 10827191: Convert extension action icons code to use ImageSkia instead of SkBitmap

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 10827191: Convert extension action icons code to use ImageSkia instead of SkBitmap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nits Created 8 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/page_action_apitest.cc ('k') | chrome/browser/ui/cocoa/extensions/browser_action_button.mm » ('j') | chrome/browser/ui/cocoa/extensions/browser_action_button.mm » ('J')
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 850ffafa56adb9443d4baad7a670ae10d3cfa136..418ff6bdc950d91cda128d4f1838a7c64592675d 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

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

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

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

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

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

// These are a mash-up of the tests from from page_actions_apitest.cc and

// browser_actions_apitest.cc.

@@ -95,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, Basic) {

}

// Test that we received the changes.

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

+ EXPECT_FALSE(action->GetIcon(tab_id).empty());

}

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