Showing launcher items for windowed v1 apps - pinned or not. Also - don't show windowed v1 apps in the browser list.

BUG=170731
TEST=unittest


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183345

Review URL: https://chromiumcodereview.appspot.com/12288012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183392 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 11 insertions, 1 deletions

diff --git a/ash/launcher/launcher_model.cc b/ash/launcher/launcher_model.cc
index 3c1e768..f3581fe 100644
--- a/ash/launcher/launcher_model.cc
+++ b/ash/launcher/launcher_model.cc
@@ -17,6 +17,7 @@ int LauncherItemTypeToWeight(LauncherItemType type) {
     case TYPE_BROWSER_SHORTCUT:
       return 0;
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
       return 1;
     case TYPE_TABBED:
     case TYPE_PLATFORM_APP:
diff --git a/ash/launcher/launcher_navigator.cc b/ash/launcher/launcher_navigator.cc
index 3ae1424..f1745e0 100644
--- a/ash/launcher/launcher_navigator.cc
+++ b/ash/launcher/launcher_navigator.cc
@@ -15,7 +15,8 @@ namespace {
 bool ShouldSkip(ash::LauncherItemType type) {
   return type == ash::TYPE_APP_LIST ||
          type == ash::TYPE_BROWSER_SHORTCUT ||
-         type == ash::TYPE_APP_SHORTCUT;
+         type == ash::TYPE_APP_SHORTCUT ||
+         type == ash::TYPE_WINDOWED_APP;
 }
 
 }  // namespace
diff --git a/ash/launcher/launcher_types.h b/ash/launcher/launcher_types.h
index 051d3b3..f4eed67 100644
--- a/ash/launcher/launcher_types.h
+++ b/ash/launcher/launcher_types.h
@@ -40,6 +40,9 @@ enum LauncherItemType {
 
   // Represents a platform app.
   TYPE_PLATFORM_APP,
+
+  // Represents a windowed V1 browser app.
+  TYPE_WINDOWED_APP,
 };
 
 // Represents the status of pinned or running app launcher items.
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index 8356d47..09ee63d 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -686,6 +686,7 @@ views::View* LauncherView::CreateViewForItem(const LauncherItem& item) {
     }
 
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
     case TYPE_APP_PANEL: {
       LauncherButton* button = LauncherButton::Create(
@@ -824,6 +825,7 @@ bool LauncherView::SameDragType(LauncherItemType typea,
     case TYPE_PLATFORM_APP:
       return (typeb == TYPE_TABBED || typeb == TYPE_PLATFORM_APP);
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
     case TYPE_APP_LIST:
     case TYPE_APP_PANEL:
     case TYPE_BROWSER_SHORTCUT:
@@ -1097,6 +1099,7 @@ void LauncherView::LauncherItemChanged(int model_index,
       // Fallthrough for the new Launcher since it needs to show the activation
       // change as well.
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
     case TYPE_APP_PANEL: {
       LauncherButton* button = static_cast<LauncherButton*>(view);
@@ -1218,6 +1221,7 @@ string16 LauncherView::GetAccessibleName(const views::View* view) {
     case TYPE_TABBED:
     case TYPE_APP_PANEL:
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
       return delegate_->GetTitle(model_->items()[view_index]);
 
@@ -1259,6 +1263,7 @@ void LauncherView::ButtonPressed(views::Button* sender,
   // Collect usage statistics before we decide what to do with the click.
   switch (model_->items()[view_index].type) {
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
       Shell::GetInstance()->delegate()->RecordUserMetricsAction(
           UMA_LAUNCHER_CLICK_ON_APP);