Index: ash/launcher/launcher_view.cc |
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc |
index b75e61a8bdcedd0dfd1ef8e892dfe4f41f16ec53..5d5c637517b97cf0b2b68944bc8c29fe30454529 100644 |
--- a/ash/launcher/launcher_view.cc |
+++ b/ash/launcher/launcher_view.cc |
@@ -309,7 +309,8 @@ views::View* LauncherView::CreateViewForItem(const LauncherItem& item) { |
break; |
} |
- case TYPE_APP: { |
+ case TYPE_APP: |
+ case TYPE_PANEL: { |
AppLauncherButton* button = new AppLauncherButton(this, this); |
button->SetAppImage(item.image); |
view = button; |
@@ -417,7 +418,9 @@ void LauncherView::GetOverflowItems(std::vector<LauncherItem>* items) { |
} |
while (index < view_model_->view_size()) { |
const LauncherItem& item = model_->items()[index]; |
- if (item.type == TYPE_TABBED || item.type == TYPE_APP) |
+ if (item.type == TYPE_TABBED || |
+ item.type == TYPE_APP || |
+ item.type == TYPE_PANEL) |
items->push_back(item); |
index++; |
} |
@@ -560,7 +563,8 @@ void LauncherView::LauncherItemChanged(int model_index, |
break; |
} |
- case TYPE_APP: { |
+ case TYPE_APP: |
+ case TYPE_PANEL: { |
AppLauncherButton* button = static_cast<AppLauncherButton*>(view); |
button->SetAppImage(item.image); |
button->SchedulePaint(); |
@@ -630,6 +634,7 @@ string16 LauncherView::GetAccessibleName(views::View* view) { |
switch (model_->items()[view_index].type) { |
case TYPE_TABBED: |
case TYPE_APP: |
+ case TYPE_PANEL: |
return delegate_->GetTitle(model_->items()[view_index]); |
case TYPE_APP_LIST: |
@@ -656,6 +661,7 @@ void LauncherView::ButtonPressed(views::Button* sender, |
switch (model_->items()[view_index].type) { |
case TYPE_TABBED: |
case TYPE_APP: |
+ case TYPE_PANEL: |
delegate_->ItemClicked(model_->items()[view_index]); |
break; |