chrome/browser/ui/views/location_bar/location_bar_view.cc - Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a 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/ui/views/location_bar/location_bar_view.cc

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 8 years, 7 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/views/location_bar/icon_label_bubble_view.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/location_bar/location_bar_view.cc

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

index 243e8414a3f503d322c54c14eedbf252b8118aea..2c77d599e3aa5355467a6382f3cccd6d43ad824a 100644

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

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

@@ -626,7 +626,7 @@ void LocationBarView::Layout() {

} else {

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

selected_keyword_view_->SetImage(

- *rb.GetBitmapNamed(IDR_OMNIBOX_SEARCH));

+ *rb.GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));

selected_keyword_view_->set_is_extension_icon(false);

}

@@ -905,7 +905,7 @@ void LocationBarView::OnAutocompleteAccept(

void LocationBarView::OnChanged() {

location_icon_view_->SetImage(

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

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

location_entry_->GetIcon()));

location_icon_view_->ShowTooltip(!GetLocationEntry()->IsEditingOrEmpty());