Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(877)

Unified Diff: chrome/browser/first_run/try_chrome_dialog_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
Index: chrome/browser/first_run/try_chrome_dialog_view.cc
diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc
index 1eda4a640f7671aa9a4d83b771fbba6749f1f6ba..082d7d058497323bfbc7fd904b1bd78242e602f9 100644
--- a/chrome/browser/first_run/try_chrome_dialog_view.cc
+++ b/chrome/browser/first_run/try_chrome_dialog_view.cc
@@ -64,7 +64,7 @@ TryChromeDialogView::Result TryChromeDialogView::ShowModal(
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
views::ImageView* icon = new views::ImageView();
- icon->SetImage(rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_32).ToSkBitmap());
+ icon->SetImage(rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_32).ToImageSkia());
gfx::Size icon_size = icon->GetPreferredSize();
// An approximate window size. After Layout() we'll get better bounds.
@@ -159,11 +159,11 @@ TryChromeDialogView::Result TryChromeDialogView::ShowModal(
// The close button is custom.
views::ImageButton* close_button = new views::ImageButton(this);
close_button->SetImage(views::CustomButton::BS_NORMAL,
- rb.GetNativeImageNamed(IDR_CLOSE_BAR).ToSkBitmap());
+ rb.GetNativeImageNamed(IDR_CLOSE_BAR).ToImageSkia());
close_button->SetImage(views::CustomButton::BS_HOT,
- rb.GetNativeImageNamed(IDR_CLOSE_BAR_H).ToSkBitmap());
+ rb.GetNativeImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());
close_button->SetImage(views::CustomButton::BS_PUSHED,
- rb.GetNativeImageNamed(IDR_CLOSE_BAR_P).ToSkBitmap());
+ rb.GetNativeImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
close_button->set_tag(BT_CLOSE_BUTTON);
layout->AddView(close_button);
« no previous file with comments | « chrome/browser/chromeos/options/wimax_config_view.cc ('k') | chrome/browser/ui/panels/panel_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698