chrome/browser/ui/cocoa/extensions/browser_action_button.mm - Issue 10914244: Remove support for page_action.icons, and the legacy code surrounding it.

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/ui/cocoa/extensions/browser_action_button.mm

Issue 10914244: Remove support for page_action.icons, and the legacy code surrounding it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: constants removed 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/ui/cocoa/location_bar/page_action_decoration.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/browser_action_button.mm

diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm

index 8cc50bbe386bf658d11e86a049654693e14c0306..d188840ef0f7fa18aa87bc2bc8b0d1f243883b0c 100644

--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm

+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm

@@ -68,7 +68,7 @@ class ExtensionImageTrackerBridge : public content::NotificationObserver,

void OnImageLoaded(const gfx::Image& image,

const std::string& extension_id,

int index) OVERRIDE {

- browser_action_->CacheIcon(browser_action_->default_icon_path(), image);

+ browser_action_->CacheIcon(image);

[owner_ updateState];

}