ash: Replace launcher app type with Extension launch type.

chrome/browser/ui/views/ash/launcher/launcher_updater.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/ash/launcher/launcher_updater.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 
-namespace {
-
-ChromeLauncherDelegate::AppType GetDelegateType(LauncherUpdater::Type type) {
-  switch (type) {
-    case LauncherUpdater::TYPE_APP_PANEL:
-      return ChromeLauncherDelegate::APP_TYPE_APP_PANEL;
-    case LauncherUpdater::TYPE_EXTENSION_PANEL:
-      return ChromeLauncherDelegate::APP_TYPE_EXTENSION_PANEL;
-    case LauncherUpdater::TYPE_TABBED:
-      NOTREACHED();
-  }
-  return ChromeLauncherDelegate::APP_TYPE_WINDOW;
-}
-
-}  // namespace
-
 LauncherUpdater::LauncherUpdater(aura::Window* window,
                                  TabStripModel* tab_model,
                                  ChromeLauncherDelegate* delegate,
                                  Type type,
                                  const std::string& app_id)
     : window_(window),
       tab_model_(tab_model),
       launcher_delegate_(delegate),
       type_(type),
       app_id_(app_id),
       is_incognito_(tab_model->profile()->GetOriginalProfile() !=
                     tab_model->profile()),
       item_id_(-1) {
 }
 
 LauncherUpdater::~LauncherUpdater() {
   tab_model_->RemoveObserver(this);
   if (item_id_ != -1)
     launcher_delegate_->LauncherItemClosed(item_id_);
 }
 
 void LauncherUpdater::Init() {
   tab_model_->AddObserver(this);
   ash::LauncherItemStatus app_status =
       ash::wm::IsActiveWindow(window_) ?
           ash::STATUS_ACTIVE : ash::STATUS_RUNNING;
   if (type_ != TYPE_TABBED) {
-    ChromeLauncherDelegate::AppType app_type = GetDelegateType(type_);
     item_id_ = launcher_delegate_->CreateAppLauncherItem(
-        this, app_id_, app_type, app_status);
+        this, app_id_, app_status);
   } else {
     item_id_ = launcher_delegate_->CreateTabbedLauncherItem(
         this,
         is_incognito_ ? ChromeLauncherDelegate::STATE_INCOGNITO :
-                       ChromeLauncherDelegate::STATE_NOT_INCOGNITO,
+                        ChromeLauncherDelegate::STATE_NOT_INCOGNITO,
         app_status);
   }
   // In testing scenarios we can get tab strips with no active contents.
   if (tab_model_->GetActiveTabContents())
     UpdateLauncher(tab_model_->GetActiveTabContents());
 }
 
 // static
 LauncherUpdater* LauncherUpdater::Create(Browser* browser) {
   Type type;
@@ skipping 103 matching lines @@
     } else {
       item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     }
   }
   launcher_model()->Set(item_index, item);
 }
 
 ash::LauncherModel* LauncherUpdater::launcher_model() {
   return launcher_delegate_->model();
 }