diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 20:19:49 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 20:19:49 +0000 |
| commit | 3f921d7d0e8e0265f3b48a01ef4fd127a243b4f6 (patch) | |
| tree | bd34b3e73a4a3b68ebae920e8c6274f01bcb4904 /chrome/browser/first_run | |
| parent | 1b78b7e974e754518d60819b69935832cfedf4f5 (diff) | |
| download | chromium_src-3f921d7d0e8e0265f3b48a01ef4fd127a243b4f6.zip chromium_src-3f921d7d0e8e0265f3b48a01ef4fd127a243b4f6.tar.gz chromium_src-3f921d7d0e8e0265f3b48a01ef4fd127a243b4f6.tar.bz2 | |
first_run: Call ResourceBundle::GetNativeImageNamed() instead of GetBitmapNamed().
BUG=58030
TEST=None
R=rsesek@chromium.org
Review URL: http://codereview.chromium.org/7033028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/try_chrome_dialog_view.cc | 9 |
1 files changed, 5 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 3d07f11..8172907 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc @@ -17,6 +17,7 @@ #include "grit/theme_resources_standard.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/image.h" #include "views/controls/button/image_button.h" #include "views/controls/button/radio_button.h" #include "views/controls/image_view.h" @@ -62,7 +63,7 @@ TryChromeDialogView::Result TryChromeDialogView::ShowModal( ResourceBundle& rb = ResourceBundle::GetSharedInstance(); views::ImageView* icon = new views::ImageView(); - icon->SetImage(*rb.GetBitmapNamed(IDR_PRODUCT_ICON_32)); + icon->SetImage(*rb.GetNativeImageNamed(IDR_PRODUCT_ICON_32)); gfx::Size icon_size = icon->GetPreferredSize(); // An approximate window size. After Layout() we'll get better bounds. @@ -153,11 +154,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.GetBitmapNamed(IDR_CLOSE_BAR)); + rb.GetNativeImageNamed(IDR_CLOSE_BAR)); close_button->SetImage(views::CustomButton::BS_HOT, - rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); + rb.GetNativeImageNamed(IDR_CLOSE_BAR_H)); close_button->SetImage(views::CustomButton::BS_PUSHED, - rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); + rb.GetNativeImageNamed(IDR_CLOSE_BAR_P)); close_button->set_tag(BT_CLOSE_BUTTON); layout->AddView(close_button); |