diff options
Diffstat (limited to 'chrome/browser/ui')
40 files changed, 127 insertions, 135 deletions
diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc index 6f181f6..61489a8 100644 --- a/chrome/browser/ui/panels/panel_browser_frame_view.cc +++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc @@ -110,16 +110,16 @@ const SkColor kBorderColor = 0xc0000000; const SkColor kDividerColor = 0xffb5b5b5; struct ButtonResources { - gfx::ImageSkia* normal_image; - gfx::ImageSkia* hover_image; + SkBitmap* normal_image; + SkBitmap* hover_image; string16 tooltip_text; ButtonResources(int normal_image_id, int hover_image_id, int tooltip_id) : normal_image(NULL), hover_image(NULL) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - normal_image = rb.GetImageSkiaNamed(normal_image_id); - hover_image = rb.GetImageSkiaNamed(hover_image_id); + normal_image = rb.GetBitmapNamed(normal_image_id); + hover_image = rb.GetBitmapNamed(hover_image_id); tooltip_text = l10n_util::GetStringUTF16(tooltip_id); } }; diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc index dedf6df..6640a63 100644 --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -30,7 +30,7 @@ TEST(UiGfxImageTest, ViewsImageView) { container->SetVisible(true); scoped_ptr<views::ImageView> image_view(new views::ImageView()); - image_view->SetImage(*image.ToImageSkia()); + image_view->SetImage(*image.ToSkBitmap()); container->AddChildView(image_view.get()); } #endif diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc index ead319f..14a0c03 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc @@ -298,10 +298,10 @@ const SkBitmap* AutocompleteResultView::GetIcon() const { return ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(icon); } -const gfx::ImageSkia* AutocompleteResultView::GetKeywordIcon() const { +const SkBitmap* AutocompleteResultView::GetKeywordIcon() const { // NOTE: If we ever begin returning icons of varying size, then callers need // to ensure that |keyword_icon_| is resized each time its image is reset. - return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( + return ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( (GetState() == SELECTED) ? IDR_OMNIBOX_TTS_SELECTED : IDR_OMNIBOX_TTS); } @@ -632,3 +632,4 @@ void AutocompleteResultView::AnimationProgressed( Layout(); SchedulePaint(); } + diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h index bdaf700..7d79dfd 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h +++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h @@ -94,7 +94,7 @@ class AutocompleteResultView : public views::View, ResultViewState GetState() const; const SkBitmap* GetIcon() const; - const gfx::ImageSkia* GetKeywordIcon() const; + const SkBitmap* GetKeywordIcon() const; // Elides |runs| to fit in |remaining_width|. The runs in |runs| should be in // logical order. diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc index fea4611..e23d3ee 100644 --- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc +++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc @@ -183,9 +183,9 @@ ProfileItemView::ProfileItemView(const AvatarMenuModel::Item& item, SkBitmap profile_icon = *item_.icon.ToSkBitmap(); if (item_.active) { SkBitmap badged_icon(GetBadgedIcon(profile_icon)); - image_view_->SetImage(badged_icon); + image_view_->SetImage(&badged_icon); } else { - image_view_->SetImage(profile_icon); + image_view_->SetImage(&profile_icon); } AddChildView(image_view_); diff --git a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc index a52d855..918f7e6 100644 --- a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc +++ b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc @@ -72,8 +72,7 @@ void CheckboxNativeThemeBorder::GetInsets(gfx::Insets* insets) const { void SetImageViewToId(views::View* image_view, int id) { views::ImageView* image = static_cast<views::ImageView*>(image_view); if (image) - image->SetImage( - ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id)); + image->SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(id)); } } // namespace diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc index 68dbdf5..6b8722c 100644 --- a/chrome/browser/ui/views/collected_cookies_views.cc +++ b/chrome/browser/ui/views/collected_cookies_views.cc @@ -85,7 +85,7 @@ class InfobarView : public views::View { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); info_image_ = new views::ImageView(); - info_image_->SetImage(rb.GetImageSkiaNamed(IDR_INFO)); + info_image_->SetImage(rb.GetBitmapNamed(IDR_INFO)); label_ = new views::Label(); } virtual ~InfobarView() {} diff --git a/chrome/browser/ui/views/confirm_bubble_view.cc b/chrome/browser/ui/views/confirm_bubble_view.cc index 21655cb..59338b4 100644 --- a/chrome/browser/ui/views/confirm_bubble_view.cc +++ b/chrome/browser/ui/views/confirm_bubble_view.cc @@ -80,7 +80,7 @@ void ConfirmBubbleView::Init() { gfx::Image* icon_image = model_->GetIcon(); DCHECK(icon_image); views::ImageView* icon_view = new views::ImageView; - icon_view->SetImage(icon_image->ToImageSkia()); + icon_view->SetImage(icon_image->ToSkBitmap()); layout->AddView(icon_view); const string16 title_text = model_->GetTitle(); @@ -90,8 +90,8 @@ void ConfirmBubbleView::Init() { layout->AddView(title_label); views::ImageButton* close_button = new views::ImageButton(this); - const gfx::ImageSkia* close_image = - bundle.GetImageNamed(IDR_INFO_BUBBLE_CLOSE).ToImageSkia(); + const SkBitmap* close_image = + bundle.GetImageNamed(IDR_INFO_BUBBLE_CLOSE).ToSkBitmap(); close_button->SetImage(views::CustomButton::BS_NORMAL, close_image); close_button->set_tag(ConfirmBubbleModel::BUTTON_NONE); layout->AddView(close_button); diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc index 53d479f..d778383 100644 --- a/chrome/browser/ui/views/constrained_window_views.cc +++ b/chrome/browser/ui/views/constrained_window_views.cc @@ -296,11 +296,11 @@ ConstrainedWindowFrameView::ConstrainedWindowFrameView( ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); close_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_CLOSE_SA)); + rb.GetBitmapNamed(IDR_CLOSE_SA)); close_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_CLOSE_SA_H)); + rb.GetBitmapNamed(IDR_CLOSE_SA_H)); close_button_->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_CLOSE_SA_P)); + rb.GetBitmapNamed(IDR_CLOSE_SA_P)); close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE); AddChildView(close_button_); diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index a627bc2..14e16504 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -161,7 +161,7 @@ void AppInfoView::UpdateText(const string16& title, void AppInfoView::UpdateIcon(const gfx::Image& image) { if (!image.IsEmpty()) - icon_->SetImage(image.ToImageSkia()); + icon_->SetImage(image.ToSkBitmap()); } void AppInfoView::OnPaint(gfx::Canvas* canvas) { diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index 5020f6e..ecf88f7 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -176,7 +176,7 @@ void CriticalNotificationBubbleView::Init() { layout->StartRow(0, top_column_set_id); views::ImageView* image = new views::ImageView(); - image->SetImage(rb.GetImageSkiaNamed(IDR_UPDATE_MENU3)); + image->SetImage(rb.GetBitmapNamed(IDR_UPDATE_MENU3)); layout->AddView(image); headline_ = new views::Label(); diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc index 0d11adf9..8660740 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_view.cc @@ -307,7 +307,7 @@ void DownloadShelfView::ViewHierarchyChanged(bool is_add, ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); arrow_image_ = new views::ImageView(); - arrow_image_->SetImage(rb.GetImageSkiaNamed(IDR_DOWNLOADS_FAVICON)); + arrow_image_->SetImage(rb.GetBitmapNamed(IDR_DOWNLOADS_FAVICON)); AddChildView(arrow_image_); show_all_view_ = new views::Link( @@ -320,11 +320,11 @@ void DownloadShelfView::ViewHierarchyChanged(bool is_add, close_button_ = new views::ImageButton(this); close_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR)); + rb.GetBitmapNamed(IDR_CLOSE_BAR)); close_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); close_button_->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); close_button_->SetAccessibleName( l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); UpdateButtonColors(); @@ -364,8 +364,8 @@ void DownloadShelfView::UpdateButtonColors() { if (GetThemeProvider()) { close_button_->SetBackground( GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT), - rb.GetImageSkiaNamed(IDR_CLOSE_BAR), - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_MASK)); + rb.GetBitmapNamed(IDR_CLOSE_BAR), + rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK)); } } diff --git a/chrome/browser/ui/views/download/download_started_animation_views.cc b/chrome/browser/ui/views/download/download_started_animation_views.cc index f711ca1..fd4d9c3 100644 --- a/chrome/browser/ui/views/download/download_started_animation_views.cc +++ b/chrome/browser/ui/views/download/download_started_animation_views.cc @@ -82,9 +82,9 @@ DownloadStartedAnimationWin::DownloadStartedAnimationWin( : ui::LinearAnimation(kMoveTimeMs, kFrameRateHz, NULL), popup_(NULL), web_contents_(web_contents) { - static gfx::ImageSkia* kDownloadImage = NULL; + static SkBitmap* kDownloadImage = NULL; if (!kDownloadImage) { - kDownloadImage = ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( + kDownloadImage = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( IDR_DOWNLOAD_ANIMATION_BEGIN); } diff --git a/chrome/browser/ui/views/dropdown_bar_view.cc b/chrome/browser/ui/views/dropdown_bar_view.cc index 42e1f3b..dd91908 100644 --- a/chrome/browser/ui/views/dropdown_bar_view.cc +++ b/chrome/browser/ui/views/dropdown_bar_view.cc @@ -13,7 +13,6 @@ #include "third_party/skia/include/core/SkRect.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/image/image_skia.h" #include "ui/views/background.h" #include "ui/views/border.h" #include "ui/views/painter.h" @@ -30,8 +29,8 @@ const int kAnimatingEdgeHeight = 5; class DropdownBackground : public views::Background { public: explicit DropdownBackground(BrowserView* browser, - const gfx::ImageSkia* left_alpha_mask, - const gfx::ImageSkia* right_alpha_mask); + const SkBitmap* left_alpha_mask, + const SkBitmap* right_alpha_mask); virtual ~DropdownBackground() {} // Overridden from views::Background. @@ -39,15 +38,15 @@ class DropdownBackground : public views::Background { private: BrowserView* browser_view_; - const gfx::ImageSkia* left_alpha_mask_; - const gfx::ImageSkia* right_alpha_mask_; + const SkBitmap* left_alpha_mask_; + const SkBitmap* right_alpha_mask_; DISALLOW_COPY_AND_ASSIGN(DropdownBackground); }; DropdownBackground::DropdownBackground(BrowserView* browser_view, - const gfx::ImageSkia* left_alpha_mask, - const gfx::ImageSkia* right_alpha_mask) + const SkBitmap* left_alpha_mask, + const SkBitmap* right_alpha_mask) : browser_view_(browser_view), left_alpha_mask_(left_alpha_mask), right_alpha_mask_(right_alpha_mask) { @@ -123,8 +122,8 @@ void DropdownBarView::OnPaint(gfx::Canvas* canvas) { //////////////////////////////////////////////////////////////////////////////// // DropDownBarView, protected: -void DropdownBarView::SetBackground(const gfx::ImageSkia* left_alpha_mask, - const gfx::ImageSkia* right_alpha_mask) { +void DropdownBarView::SetBackground(const SkBitmap* left_alpha_mask, + const SkBitmap* right_alpha_mask) { set_background(new DropdownBackground(host()->browser_view(), left_alpha_mask, right_alpha_mask)); } diff --git a/chrome/browser/ui/views/dropdown_bar_view.h b/chrome/browser/ui/views/dropdown_bar_view.h index a8b7c01..635f0a6 100644 --- a/chrome/browser/ui/views/dropdown_bar_view.h +++ b/chrome/browser/ui/views/dropdown_bar_view.h @@ -12,7 +12,6 @@ namespace gfx { class Canvas; -class ImageSkia; } // namespace gfx //////////////////////////////////////////////////////////////////////////////// @@ -41,8 +40,8 @@ class DropdownBarView : public views::AccessiblePaneView, // Returns the DropdownBarHost that manages this view. DropdownBarHost* host() const { return host_; } - void SetBackground(const gfx::ImageSkia* left_alpha_mask, - const gfx::ImageSkia* right_alpha_mask); + void SetBackground(const SkBitmap* left_alpha_mask, + const SkBitmap* right_alpha_mask); void SetBorder(int left_border_bitmap_id, int middle_border_bitmap_id, int right_border_bitmap_id); diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 6aeeeec..d962008 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -251,9 +251,9 @@ void EditSearchEngineDialog::UpdateImageView(ImageView* image_view, ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); if (is_valid) { image_view->SetTooltipText(string16()); - image_view->SetImage(rb.GetImageSkiaNamed(IDR_INPUT_GOOD)); + image_view->SetImage(rb.GetBitmapNamed(IDR_INPUT_GOOD)); } else { image_view->SetTooltipText(l10n_util::GetStringUTF16(invalid_message_id)); - image_view->SetImage(rb.GetImageSkiaNamed(IDR_INPUT_ALERT)); + image_view->SetImage(rb.GetBitmapNamed(IDR_INPUT_ALERT)); } } diff --git a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc index 6aa7d9e..49f8bf4 100644 --- a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc @@ -130,11 +130,11 @@ class BundleInstalledBubble : public views::BubbleDelegateView, views::ImageButton* button = new views::ImageButton(listener); button->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR)); + rb.GetBitmapNamed(IDR_CLOSE_BAR)); button->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); button->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); layout->AddView(button); } diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index d20b36c..8b767db 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -225,11 +225,11 @@ class InstalledBubbleContent : public views::View, close_button_ = new views::ImageButton(this); close_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR)); + rb.GetBitmapNamed(IDR_CLOSE_BAR)); close_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); close_button_->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); AddChildView(close_button_); } diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 34695e0..8b9b97a 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -100,11 +100,11 @@ FindBarView::FindBarView(FindBarHost* host) find_previous_button_->set_tag(FIND_PREVIOUS_TAG); find_previous_button_->set_focusable(true); find_previous_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_FINDINPAGE_PREV)); + rb.GetBitmapNamed(IDR_FINDINPAGE_PREV)); find_previous_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_FINDINPAGE_PREV_H)); + rb.GetBitmapNamed(IDR_FINDINPAGE_PREV_H)); find_previous_button_->SetImage(views::CustomButton::BS_DISABLED, - rb.GetImageSkiaNamed(IDR_FINDINPAGE_PREV_P)); + rb.GetBitmapNamed(IDR_FINDINPAGE_PREV_P)); find_previous_button_->SetTooltipText( l10n_util::GetStringUTF16(IDS_FIND_IN_PAGE_PREVIOUS_TOOLTIP)); find_previous_button_->SetAccessibleName( @@ -115,11 +115,11 @@ FindBarView::FindBarView(FindBarHost* host) find_next_button_->set_tag(FIND_NEXT_TAG); find_next_button_->set_focusable(true); find_next_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_FINDINPAGE_NEXT)); + rb.GetBitmapNamed(IDR_FINDINPAGE_NEXT)); find_next_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_FINDINPAGE_NEXT_H)); + rb.GetBitmapNamed(IDR_FINDINPAGE_NEXT_H)); find_next_button_->SetImage(views::CustomButton::BS_DISABLED, - rb.GetImageSkiaNamed(IDR_FINDINPAGE_NEXT_P)); + rb.GetBitmapNamed(IDR_FINDINPAGE_NEXT_P)); find_next_button_->SetTooltipText( l10n_util::GetStringUTF16(IDS_FIND_IN_PAGE_NEXT_TOOLTIP)); find_next_button_->SetAccessibleName( @@ -130,19 +130,19 @@ FindBarView::FindBarView(FindBarHost* host) close_button_->set_tag(CLOSE_TAG); close_button_->set_focusable(true); close_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR)); + rb.GetBitmapNamed(IDR_CLOSE_BAR)); close_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); close_button_->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); close_button_->SetTooltipText( l10n_util::GetStringUTF16(IDS_FIND_IN_PAGE_CLOSE_TOOLTIP)); close_button_->SetAccessibleName( l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); AddChildView(close_button_); - SetBackground(rb.GetImageSkiaNamed(IDR_FIND_DLG_LEFT_BACKGROUND), - rb.GetImageSkiaNamed(IDR_FIND_DLG_RIGHT_BACKGROUND)); + SetBackground(rb.GetBitmapNamed(IDR_FIND_DLG_LEFT_BACKGROUND), + rb.GetBitmapNamed(IDR_FIND_DLG_RIGHT_BACKGROUND)); SetBorder(IDR_FIND_DIALOG_LEFT, IDR_FIND_DIALOG_MIDDLE, IDR_FIND_DIALOG_RIGHT); @@ -489,7 +489,7 @@ void FindBarView::OnThemeChanged() { if (GetThemeProvider()) { close_button_->SetBackground( GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT), - rb.GetImageSkiaNamed(IDR_CLOSE_BAR), - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_MASK)); + rb.GetBitmapNamed(IDR_CLOSE_BAR), + rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK)); } } diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc index c0be976..db807d5 100644 --- a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc +++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc @@ -132,11 +132,11 @@ class AppNonClientFrameViewAura::ControlView int hot_bitmap_id, int pushed_bitmap_id) { ui::ThemeProvider* theme_provider = GetThemeProvider(); button->SetImage(views::CustomButton::BS_NORMAL, - theme_provider->GetImageSkiaNamed(normal_bitmap_id)); + theme_provider->GetBitmapNamed(normal_bitmap_id)); button->SetImage(views::CustomButton::BS_HOT, - theme_provider->GetImageSkiaNamed(hot_bitmap_id)); + theme_provider->GetBitmapNamed(hot_bitmap_id)); button->SetImage(views::CustomButton::BS_PUSHED, - theme_provider->GetImageSkiaNamed(pushed_bitmap_id)); + theme_provider->GetBitmapNamed(pushed_bitmap_id)); } AppNonClientFrameViewAura* owner_; diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc index e117d1b..75c42c1 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc @@ -73,11 +73,11 @@ AppPanelBrowserFrameView::AppPanelBrowserFrameView(BrowserFrame* frame, ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); close_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR)); + rb.GetBitmapNamed(IDR_CLOSE_BAR)); close_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); close_button_->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); close_button_->SetAccessibleName( l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); AddChildView(close_button_); diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index df884f0..f4d82c8 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -463,16 +463,16 @@ views::ImageButton* OpaqueBrowserFrameView::InitWindowCaptionButton( views::ImageButton* button = new views::ImageButton(this); ui::ThemeProvider* tp = frame()->GetThemeProvider(); button->SetImage(views::CustomButton::BS_NORMAL, - tp->GetImageSkiaNamed(normal_bitmap_id)); + tp->GetBitmapNamed(normal_bitmap_id)); button->SetImage(views::CustomButton::BS_HOT, - tp->GetImageSkiaNamed(hot_bitmap_id)); + tp->GetBitmapNamed(hot_bitmap_id)); button->SetImage(views::CustomButton::BS_PUSHED, - tp->GetImageSkiaNamed(pushed_bitmap_id)); + tp->GetBitmapNamed(pushed_bitmap_id)); if (browser_view()->IsBrowserTypeNormal()) { button->SetBackground( tp->GetColor(ThemeService::COLOR_BUTTON_BACKGROUND), - tp->GetImageSkiaNamed(IDR_THEME_WINDOW_CONTROL_BACKGROUND), - tp->GetImageSkiaNamed(mask_bitmap_id)); + tp->GetBitmapNamed(IDR_THEME_WINDOW_CONTROL_BACKGROUND), + tp->GetBitmapNamed(mask_bitmap_id)); } button->SetAccessibleName( l10n_util::GetStringUTF16(accessibility_string_id)); diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc index 4d3044e..4733035 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.cc +++ b/chrome/browser/ui/views/global_error_bubble_view.cc @@ -69,7 +69,7 @@ GlobalErrorBubbleView::GlobalErrorBubbleView( ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); int resource_id = error_->GetBubbleViewIconResourceID(); scoped_ptr<views::ImageView> image_view(new views::ImageView()); - image_view->SetImage(rb.GetImageNamed(resource_id).ToImageSkia()); + image_view->SetImage(rb.GetImageNamed(resource_id).ToSkBitmap()); string16 title_string(error_->GetBubbleViewTitle()); scoped_ptr<views::Label> title_label(new views::Label(title_string)); diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index bcd3e91..a3d6b4b 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -300,13 +300,13 @@ class HungRendererDialogView : public views::DialogDelegateView, bool initialized_; // An amusing icon image. - static gfx::ImageSkia* frozen_icon_; + static SkBitmap* frozen_icon_; DISALLOW_COPY_AND_ASSIGN(HungRendererDialogView); }; // static -gfx::ImageSkia* HungRendererDialogView::frozen_icon_ = NULL; +SkBitmap* HungRendererDialogView::frozen_icon_ = NULL; // The distance in pixels from the top of the relevant contents to place the // warning window. @@ -556,7 +556,7 @@ void HungRendererDialogView::InitClass() { static bool initialized = false; if (!initialized) { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - frozen_icon_ = rb.GetImageSkiaNamed(IDR_FROZEN_TAB_ICON); + frozen_icon_ = rb.GetBitmapNamed(IDR_FROZEN_TAB_ICON); initialized = true; } } diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index 9b7b9fe..c22de3b 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -218,18 +218,18 @@ void InfoBarView::ViewHierarchyChanged(bool is_add, View* parent, View* child) { gfx::Image* image = delegate()->GetIcon(); if (image) { icon_ = new views::ImageView; - icon_->SetImage(image->ToImageSkia()); + icon_->SetImage(image->ToSkBitmap()); AddChildView(icon_); } close_button_ = new views::ImageButton(this); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); close_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia()); + rb.GetImageNamed(IDR_CLOSE_BAR).ToSkBitmap()); close_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia()); + rb.GetImageNamed(IDR_CLOSE_BAR_H).ToSkBitmap()); close_button_->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia()); + rb.GetImageNamed(IDR_CLOSE_BAR_P).ToSkBitmap()); close_button_->SetAccessibleName( l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); close_button_->set_focusable(true); 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 0e8d991..5c6c0c7 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,8 +22,7 @@ ChromeToMobileView::ChromeToMobileView( command_updater_(command_updater) { set_id(VIEW_ID_CHROME_TO_MOBILE_BUTTON); set_accessibility_focusable(true); - SetImage( - ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_MOBILE)); + SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_MOBILE)); SetTooltipText( l10n_util::GetStringUTF16(IDS_CHROME_TO_MOBILE_BUBBLE_TOOLTIP)); SetVisible(command_updater_->IsCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE)); diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc index c9d315e..c207f5f 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc @@ -73,7 +73,7 @@ void ContentSettingImageView::UpdateFromWebContents(WebContents* web_contents) { SetVisible(false); return; } - SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( + SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( content_setting_image_model_->get_icon())); SetTooltipText(UTF8ToUTF16(content_setting_image_model_->get_tooltip())); SetVisible(true); diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc index 19e405f..04fd098 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc @@ -26,8 +26,7 @@ IconLabelBubbleView::IconLabelBubbleView(const int background_images[], is_extension_icon_(false) { image_ = new views::ImageView(); image_->SetImage( - ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( - contained_image)); + ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(contained_image)); AddChildView(image_); label_ = new views::Label(); 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 ca9c652..75760df 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -602,7 +602,7 @@ void LocationBarView::Layout() { } else { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); selected_keyword_view_->SetImage( - *rb.GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)); + *rb.GetBitmapNamed(IDR_OMNIBOX_SEARCH)); selected_keyword_view_->set_is_extension_icon(false); } } @@ -873,7 +873,7 @@ void LocationBarView::OnAutocompleteAccept( void LocationBarView::OnChanged() { location_icon_view_->SetImage( - ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( + ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( location_entry_->GetIcon())); location_icon_view_->ShowTooltip(!GetLocationEntry()->IsEditingOrEmpty()); diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc index a7bcf21a..5877e02 100644 --- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc +++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc @@ -256,7 +256,7 @@ void PageActionImageView::UpdateVisibility(WebContents* contents, } } if (!icon.isNull()) - SetImage(icon); + SetImage(&icon); SetVisible(true); } diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index 42c09eb..98a2d2c 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -29,7 +29,7 @@ StarView::~StarView() { void StarView::SetToggled(bool on) { SetTooltipText(l10n_util::GetStringUTF16( on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR)); - SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( + SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( on ? IDR_STAR_LIT : IDR_STAR)); } diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index 9644487..1b3e838 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -380,15 +380,15 @@ void BalloonViewImpl::Show(Balloon* balloon) { frame_container_->SetAlwaysOnTop(true); close_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_TAB_CLOSE)); + rb.GetBitmapNamed(IDR_TAB_CLOSE)); close_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H)); + rb.GetBitmapNamed(IDR_TAB_CLOSE_H)); close_button_->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P)); + rb.GetBitmapNamed(IDR_TAB_CLOSE_P)); close_button_->SetBoundsRect(GetCloseButtonBounds()); close_button_->SetBackground(SK_ColorBLACK, - rb.GetImageSkiaNamed(IDR_TAB_CLOSE), - rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK)); + rb.GetBitmapNamed(IDR_TAB_CLOSE), + rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK)); options_menu_button_->SetIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH)); options_menu_button_->SetHoverIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH_H)); diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index 3ba3f04..566cf9b 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -155,7 +155,7 @@ void SadTabView::ViewHierarchyChanged(bool is_add, columns->AddPaddingColumn(1, kPadding); views::ImageView* image = new views::ImageView(); - image->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( + image->SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( (kind_ == CRASHED) ? IDR_SAD_TAB : IDR_KILLED_TAB)); layout->StartRowWithPadding(0, column_set_id, 1, kPadding); layout->AddView(image); diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc index 63d2965..ab79d0e 100644 --- a/chrome/browser/ui/views/tabs/base_tab.cc +++ b/chrome/browser/ui/views/tabs/base_tab.cc @@ -160,11 +160,11 @@ BaseTab::BaseTab(TabController* controller) close_button_ = new TabCloseButton(this); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); close_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_TAB_CLOSE)); + rb.GetBitmapNamed(IDR_TAB_CLOSE)); close_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H)); + rb.GetBitmapNamed(IDR_TAB_CLOSE_H)); close_button_->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P)); + rb.GetBitmapNamed(IDR_TAB_CLOSE_P)); close_button_->SetAccessibleName( l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); // Disable animation so that the red danger sign shows up immediately diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index 2a2184e..06172b8 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -326,8 +326,8 @@ void Tab::OnPaint(gfx::Canvas* canvas) { close_button_color_ = title_color; ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); close_button()->SetBackground(close_button_color_, - rb.GetImageSkiaNamed(IDR_TAB_CLOSE), - rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK)); + rb.GetBitmapNamed(IDR_TAB_CLOSE), + rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK)); } } diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 1ca5064..24b4b32 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -1225,7 +1225,7 @@ void TabStrip::Init() { AddChildView(newtab_button_); if (drop_indicator_width == 0) { // Direction doesn't matter, both images are the same size. - gfx::ImageSkia* drop_image = GetDropArrowImage(true); + SkBitmap* drop_image = GetDropArrowImage(true); drop_indicator_width = drop_image->width(); drop_indicator_height = drop_image->height(); } @@ -1803,8 +1803,8 @@ int TabStrip::GetDropEffect(const views::DropTargetEvent& event) { } // static -gfx::ImageSkia* TabStrip::GetDropArrowImage(bool is_down) { - return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( +SkBitmap* TabStrip::GetDropArrowImage(bool is_down) { + return ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( is_down ? IDR_TAB_DROP_DOWN : IDR_TAB_DROP_UP); } diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index bd22a4e..6ebe33f 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h @@ -392,7 +392,7 @@ class TabStrip : public views::View, // Returns the image to use for indicating a drop on a tab. If is_down is // true, this returns an arrow pointing down. - static gfx::ImageSkia* GetDropArrowImage(bool is_down); + static SkBitmap* GetDropArrowImage(bool is_down); // -- Animations ------------------------------------------------------------ diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 464db9f..bdc2fe0 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -748,45 +748,41 @@ int ToolbarView::PopupTopSpacing() const { void ToolbarView::LoadImages() { ui::ThemeProvider* tp = GetThemeProvider(); - back_->SetImage(views::CustomButton::BS_NORMAL, - tp->GetImageSkiaNamed(IDR_BACK)); - back_->SetImage(views::CustomButton::BS_HOT, - tp->GetImageSkiaNamed(IDR_BACK_H)); + back_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_BACK)); + back_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_BACK_H)); back_->SetImage(views::CustomButton::BS_PUSHED, - tp->GetImageSkiaNamed(IDR_BACK_P)); + tp->GetBitmapNamed(IDR_BACK_P)); back_->SetImage(views::CustomButton::BS_DISABLED, - tp->GetImageSkiaNamed(IDR_BACK_D)); + tp->GetBitmapNamed(IDR_BACK_D)); forward_->SetImage(views::CustomButton::BS_NORMAL, - tp->GetImageSkiaNamed(IDR_FORWARD)); + tp->GetBitmapNamed(IDR_FORWARD)); forward_->SetImage(views::CustomButton::BS_HOT, - tp->GetImageSkiaNamed(IDR_FORWARD_H)); + tp->GetBitmapNamed(IDR_FORWARD_H)); forward_->SetImage(views::CustomButton::BS_PUSHED, - tp->GetImageSkiaNamed(IDR_FORWARD_P)); + tp->GetBitmapNamed(IDR_FORWARD_P)); forward_->SetImage(views::CustomButton::BS_DISABLED, - tp->GetImageSkiaNamed(IDR_FORWARD_D)); + tp->GetBitmapNamed(IDR_FORWARD_D)); reload_->SetImage(views::CustomButton::BS_NORMAL, - tp->GetImageSkiaNamed(IDR_RELOAD)); + tp->GetBitmapNamed(IDR_RELOAD)); reload_->SetImage(views::CustomButton::BS_HOT, - tp->GetImageSkiaNamed(IDR_RELOAD_H)); + tp->GetBitmapNamed(IDR_RELOAD_H)); reload_->SetImage(views::CustomButton::BS_PUSHED, - tp->GetImageSkiaNamed(IDR_RELOAD_P)); + tp->GetBitmapNamed(IDR_RELOAD_P)); reload_->SetToggledImage(views::CustomButton::BS_NORMAL, - tp->GetImageSkiaNamed(IDR_STOP)); + tp->GetBitmapNamed(IDR_STOP)); reload_->SetToggledImage(views::CustomButton::BS_HOT, - tp->GetImageSkiaNamed(IDR_STOP_H)); + tp->GetBitmapNamed(IDR_STOP_H)); reload_->SetToggledImage(views::CustomButton::BS_PUSHED, - tp->GetImageSkiaNamed(IDR_STOP_P)); + tp->GetBitmapNamed(IDR_STOP_P)); reload_->SetToggledImage(views::CustomButton::BS_DISABLED, - tp->GetImageSkiaNamed(IDR_STOP_D)); + tp->GetBitmapNamed(IDR_STOP_D)); - home_->SetImage(views::CustomButton::BS_NORMAL, - tp->GetImageSkiaNamed(IDR_HOME)); - home_->SetImage(views::CustomButton::BS_HOT, - tp->GetImageSkiaNamed(IDR_HOME_H)); + home_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_HOME)); + home_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_HOME_H)); home_->SetImage(views::CustomButton::BS_PUSHED, - tp->GetImageSkiaNamed(IDR_HOME_P)); + tp->GetBitmapNamed(IDR_HOME_P)); app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL)); app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT)); diff --git a/chrome/browser/ui/views/web_intent_picker_views.cc b/chrome/browser/ui/views/web_intent_picker_views.cc index ede5873..3ce1a08 100644 --- a/chrome/browser/ui/views/web_intent_picker_views.cc +++ b/chrome/browser/ui/views/web_intent_picker_views.cc @@ -114,7 +114,7 @@ StarsView::StarsView(double rating) for (int i = 0; i < 5; ++i) { views::ImageView* image = new views::ImageView(); - image->SetImage(rb.GetImageSkiaNamed( + image->SetImage(rb.GetBitmapNamed( WebIntentPicker::GetNthStarImageIdFromCWSRating(rating, i))); AddChildView(image); } @@ -504,7 +504,7 @@ SuggestedExtensionsRowView::SuggestedExtensionsRowView( SetLayoutManager(new SuggestedExtensionsLayout); icon_ = new views::ImageView(); - icon_->SetImage(extension_->icon.ToImageSkia()); + icon_->SetImage(extension_->icon.ToSkBitmap()); AddChildView(icon_); string16 elided_title = ui::ElideText( @@ -924,7 +924,7 @@ void WebIntentPickerViews::OnInlineDispositionWebContentsLoaded( // Header row. grid_layout->StartRow(0, 0); views::ImageView* icon = new views::ImageView(); - icon->SetImage(service->favicon.ToImageSkia()); + icon->SetImage(service->favicon.ToSkBitmap()); grid_layout->AddView(icon); string16 elided_title = ui::ElideText( @@ -1158,11 +1158,11 @@ views::ImageButton* WebIntentPickerViews::CreateCloseButton() { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); views::ImageButton* close_button = new views::ImageButton(this); close_button->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR)); + rb.GetBitmapNamed(IDR_CLOSE_BAR)); close_button->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); close_button->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P)); + rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); return close_button; } #endif diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index 0541196..753e80f 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -426,7 +426,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView, fullscreen_button_ = new FullscreenButton(this); fullscreen_button_->SetImage( ImageButton::BS_NORMAL, - ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( + ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( IDR_FULLSCREEN_MENU_BUTTON)); fullscreen_button_->set_focusable(true); fullscreen_button_->set_request_focus_on_press(false); |