chrome/browser/ui/views/location_bar/action_box_button_view.cc - Issue 10834368: Convert mostly favicon related code from SkBitmap to ImageSkia and Image

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/location_bar/action_box_button_view.cc

Issue 10834368: Convert mostly favicon related code from SkBitmap to ImageSkia and Image (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« chrome/browser/ui/gtk/location_bar_view_gtk.cc ('K') | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/action_box_button_view.cc

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

index 8fd3f508ddc7a77b17b7448f15a3016b96d8d9ab..ae2e1fac02872df29b2942d61c986b1cea74995d 100644

--- a/chrome/browser/ui/views/location_bar/action_box_button_view.cc

+++ b/chrome/browser/ui/views/location_bar/action_box_button_view.cc

@@ -40,7 +40,7 @@ ActionBoxButtonView::ActionBoxButtonView(Browser* browser, Profile* profile)

starred_(false) {

set_id(VIEW_ID_ACTION_BOX_BUTTON);

SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_ACTION_BOX_BUTTON));

- SetIcon(*ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(

+ SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

IDR_ACTION_BOX_BUTTON));

set_accessibility_focusable(true);

set_border(NULL);