chrome/browser/ui/views/location_bar/chrome_to_mobile_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/chrome_to_mobile_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/infobars/infobar_view.cc ('k') | chrome/browser/ui/views/location_bar/content_setting_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/chrome_to_mobile_view.cc

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

index 5c6c0c73df460f3906ecfd6a012f18b1908e620b..0e8d99104e7012dc9c059194761efa0860ab9e50 100644

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

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

@@ -22,7 +22,8 @@ ChromeToMobileView::ChromeToMobileView(

command_updater_(command_updater) {

set_id(VIEW_ID_CHROME_TO_MOBILE_BUTTON);

set_accessibility_focusable(true);

- SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_MOBILE));

+ SetImage(

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

SetTooltipText(

l10n_util::GetStringUTF16(IDS_CHROME_TO_MOBILE_BUBBLE_TOOLTIP));

SetVisible(command_updater_->IsCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE));