| Index: ash/launcher/launcher_view.cc
|
| diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
|
| index 0434a947dc0b2e3463ba79e5d3607176d53b20a5..56646d9dacc989548675e4e5f929190209aeb0c0 100644
|
| --- a/ash/launcher/launcher_view.cc
|
| +++ b/ash/launcher/launcher_view.cc
|
| @@ -303,7 +303,7 @@ views::View* LauncherView::CreateViewForItem(const LauncherItem& item) {
|
| switch (item.type) {
|
| case TYPE_TABBED: {
|
| TabbedLauncherButton* button = new TabbedLauncherButton(this, this);
|
| - button->SetTabImage(item.image, item.num_tabs);
|
| + button->SetTabImage(item);
|
| button->set_context_menu_controller(this);
|
| view = button;
|
| break;
|
| @@ -551,7 +551,7 @@ void LauncherView::LauncherItemChanged(int model_index,
|
| case TYPE_TABBED: {
|
| TabbedLauncherButton* button = static_cast<TabbedLauncherButton*>(view);
|
| gfx::Size pref = button->GetPreferredSize();
|
| - button->SetTabImage(item.image, item.num_tabs);
|
| + button->SetTabImage(item);
|
| if (pref != button->GetPreferredSize())
|
| AnimateToIdealBounds();
|
| else
|
|
|