summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/views')
-rw-r--r--chrome/browser/ui/views/hung_renderer_view.cc4
-rw-r--r--chrome/browser/ui/views/infobars/infobar_button_border.cc54
-rw-r--r--chrome/browser/ui/views/infobars/infobar_view.cc2
-rw-r--r--chrome/browser/ui/views/menu_model_adapter_test.cc2
-rw-r--r--chrome/browser/ui/views/task_manager_view.cc4
-rw-r--r--chrome/browser/ui/views/web_intent_picker_views.cc16
-rw-r--r--chrome/browser/ui/views/wrench_menu.cc2
7 files changed, 42 insertions, 42 deletions
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc
index bcd3e91..3e8428c 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -84,7 +84,7 @@ class HungPagesTableModel : public views::GroupTableModel {
// Overridden from views::GroupTableModel:
virtual int RowCount();
virtual string16 GetText(int row, int column_id);
- virtual SkBitmap GetIcon(int row);
+ virtual gfx::ImageSkia GetIcon(int row);
virtual void SetObserver(ui::TableModelObserver* observer);
virtual void GetGroupRangeForItem(int item, views::GroupRange* range);
@@ -188,7 +188,7 @@ string16 HungPagesTableModel::GetText(int row, int column_id) {
return title;
}
-SkBitmap HungPagesTableModel::GetIcon(int row) {
+gfx::ImageSkia HungPagesTableModel::GetIcon(int row) {
DCHECK(row >= 0 && row < RowCount());
return tab_observers_[row]->favicon_tab_helper()->GetFavicon();
}
diff --git a/chrome/browser/ui/views/infobars/infobar_button_border.cc b/chrome/browser/ui/views/infobars/infobar_button_border.cc
index d7998b1..45fc88f 100644
--- a/chrome/browser/ui/views/infobars/infobar_button_border.cc
+++ b/chrome/browser/ui/views/infobars/infobar_button_border.cc
@@ -14,41 +14,41 @@ InfoBarButtonBorder::InfoBarButtonBorder() {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
BorderImageSet normal_set = {
- rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_N).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_N).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_N).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_N).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_N).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_N).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_N).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_N).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_N).ToSkBitmap(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_N).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_N).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_N).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_N).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_N).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_N).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_N).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_N).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_N).ToImageSkia(),
};
set_normal_set(normal_set);
BorderImageSet hot_set = {
- rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_H).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_H).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_H).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_H).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_H).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_H).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_H).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_H).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_H).ToSkBitmap(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_H).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_H).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_H).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_H).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_H).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_H).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_H).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_H).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_H).ToImageSkia(),
};
set_hot_set(hot_set);
BorderImageSet pushed_set = {
- rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_P).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_P).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_P).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_P).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_P).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_P).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_P).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_P).ToSkBitmap(),
- rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_P).ToSkBitmap(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_P).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_P).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_P).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_P).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_P).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_P).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_P).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_P).ToImageSkia(),
+ rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_P).ToImageSkia(),
};
set_pushed_set(pushed_set);
}
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
index 9b7b9fe..0563e1f 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -104,7 +104,7 @@ views::MenuButton* InfoBarView::CreateMenuButton(
menu_button->set_animate_on_state_change(false);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
menu_button->set_menu_marker(
- rb.GetImageNamed(IDR_INFOBARBUTTON_MENU_DROPARROW).ToSkBitmap());
+ rb.GetImageNamed(IDR_INFOBARBUTTON_MENU_DROPARROW).ToImageSkia());
menu_button->SetEnabledColor(SK_ColorBLACK);
menu_button->SetHighlightColor(SK_ColorBLACK);
menu_button->SetHoverColor(SK_ColorBLACK);
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc
index 0ec3eb9..74371a8 100644
--- a/chrome/browser/ui/views/menu_model_adapter_test.cc
+++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -143,7 +143,7 @@ class CommonMenuModel : public ui::MenuModel {
return 0;
}
- virtual bool GetIconAt(int index, SkBitmap* icon) OVERRIDE {
+ virtual bool GetIconAt(int index, gfx::ImageSkia* icon) OVERRIDE {
return false;
}
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index bd56df4..b110211 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -67,7 +67,7 @@ class TaskManagerTableModel : public views::GroupTableModel,
// GroupTableModel.
int RowCount() OVERRIDE;
string16 GetText(int row, int column) OVERRIDE;
- SkBitmap GetIcon(int row) OVERRIDE;
+ gfx::ImageSkia GetIcon(int row) OVERRIDE;
void GetGroupRangeForItem(int item, views::GroupRange* range) OVERRIDE;
void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE;
@@ -163,7 +163,7 @@ string16 TaskManagerTableModel::GetText(int row, int col_id) {
}
}
-SkBitmap TaskManagerTableModel::GetIcon(int row) {
+gfx::ImageSkia TaskManagerTableModel::GetIcon(int row) {
return model_->GetResourceIcon(row);
}
diff --git a/chrome/browser/ui/views/web_intent_picker_views.cc b/chrome/browser/ui/views/web_intent_picker_views.cc
index 2a5e35b..5de1d08 100644
--- a/chrome/browser/ui/views/web_intent_picker_views.cc
+++ b/chrome/browser/ui/views/web_intent_picker_views.cc
@@ -144,20 +144,20 @@ class ThrobberNativeTextButton : public views::NativeTextButton {
void StopThrobber();
// Set the throbber bitmap to use. IDR_THROBBER is used by default.
- void SetFrames(const SkBitmap* frames);
+ void SetFrames(const gfx::ImageSkia* frames);
protected:
- virtual const SkBitmap& GetImageToPaint() const OVERRIDE;
+ virtual const gfx::ImageSkia& GetImageToPaint() const OVERRIDE;
private:
// The timer callback to schedule painting this view.
void Run();
- // Bitmap that contains the throbber frames.
- const SkBitmap* frames_;
+ // Image that contains the throbber frames.
+ const gfx::ImageSkia* frames_;
// The currently displayed frame, given to GetImageToPaint.
- mutable SkBitmap this_frame_;
+ mutable gfx::ImageSkia this_frame_;
// How long one frame is displayed.
base::TimeDelta frame_time_;
@@ -184,7 +184,7 @@ ThrobberNativeTextButton::ThrobberNativeTextButton(
frame_count_(0),
running_(false) {
SetFrames(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
- IDR_THROBBER).ToSkBitmap());
+ IDR_THROBBER).ToImageSkia());
}
ThrobberNativeTextButton::~ThrobberNativeTextButton() {
@@ -210,7 +210,7 @@ void ThrobberNativeTextButton::StopThrobber() {
running_ = false;
}
-void ThrobberNativeTextButton::SetFrames(const SkBitmap* frames) {
+void ThrobberNativeTextButton::SetFrames(const gfx::ImageSkia* frames) {
frames_ = frames;
DCHECK(frames_->width() > 0 && frames_->height() > 0);
DCHECK(frames_->width() % frames_->height() == 0);
@@ -218,7 +218,7 @@ void ThrobberNativeTextButton::SetFrames(const SkBitmap* frames) {
PreferredSizeChanged();
}
-const SkBitmap& ThrobberNativeTextButton::GetImageToPaint() const {
+const gfx::ImageSkia& ThrobberNativeTextButton::GetImageToPaint() const {
if (!running_)
return NativeTextButton::GetImageToPaint();
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index b624a33..88d9a1f 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -929,7 +929,7 @@ MenuItemView* WrenchMenu::AppendMenuItem(MenuItemView* parent,
menu_item->SetVisible(model->IsVisibleAt(index));
if (menu_type == MenuModel::TYPE_COMMAND && model->HasIcons()) {
- SkBitmap icon;
+ gfx::ImageSkia icon;
if (model->GetIconAt(index, &icon))
menu_item->SetIcon(icon);
}
generated by cgit v1.1 at 2025-11-30 09:14:28 +0000