chrome/browser/ui/views/browser_action_view.cc - 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/views/browser_action_view.cc

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/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/views/location_bar/page_action_image_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/browser_action_view.cc

diff --git a/chrome/browser/ui/views/browser_action_view.cc b/chrome/browser/ui/views/browser_action_view.cc

index 601dbd77a78d5535cf548af1704c9f16582bef07..699b70aaa0cda2c443e96d52aaa40c209136df27 100644

--- a/chrome/browser/ui/views/browser_action_view.cc

+++ b/chrome/browser/ui/views/browser_action_view.cc

@@ -216,7 +216,7 @@ void BrowserActionButton::ShowContextMenuForView(View* source,

void BrowserActionButton::OnImageLoaded(const gfx::Image& image,

const std::string& extension_id,

int index) {

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

+ browser_action_->CacheIcon(image);

// Call back to UpdateState() because a more specific icon might have been set

// while the load was outstanding.

« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/views/location_bar/page_action_image_view.cc » ('j') | no next file with comments »