Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(255)

Unified Diff: ash/launcher/launcher_view.cc

Issue 9590001: Launch panels as popup windows in Aura, and add separate launcher icon logic for panels. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: . Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698