diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 13:29:10 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 13:29:10 +0000 |
| commit | d3ae860c873949a15d5dfd929eab28460e5d531e (patch) | |
| tree | 3f50b68a285ba62b1f1ae31cdfc8df0bdf46049f /chrome/browser/first_run | |
| parent | 9b7b57dffdf12effc49a259da5ec9e71668d3608 (diff) | |
| download | chromium_src-d3ae860c873949a15d5dfd929eab28460e5d531e.zip chromium_src-d3ae860c873949a15d5dfd929eab28460e5d531e.tar.gz chromium_src-d3ae860c873949a15d5dfd929eab28460e5d531e.tar.bz2 | |
ui/gfx: Remove the deprecated "operator const SkBitmap*" from Image API.
BUG=58030
R=rsesek@chromium.org
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9718024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/try_chrome_dialog_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc index 71135a7..1eda4a6 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)); + icon->SetImage(rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_32).ToSkBitmap()); 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)); + rb.GetNativeImageNamed(IDR_CLOSE_BAR).ToSkBitmap()); close_button->SetImage(views::CustomButton::BS_HOT, - rb.GetNativeImageNamed(IDR_CLOSE_BAR_H)); + rb.GetNativeImageNamed(IDR_CLOSE_BAR_H).ToSkBitmap()); close_button->SetImage(views::CustomButton::BS_PUSHED, - rb.GetNativeImageNamed(IDR_CLOSE_BAR_P)); + rb.GetNativeImageNamed(IDR_CLOSE_BAR_P).ToSkBitmap()); close_button->set_tag(BT_CLOSE_BUTTON); layout->AddView(close_button); |