Deprecate Browser::TYPE_PANEL

chrome/browser/ui/ash/launcher/browser_launcher_item_controller.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/ash/launcher/browser_launcher_item_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 86 matching lines @@
         browser->is_app() &&
         ChromeLauncherController::instance()->GetPerAppInterface()) {
       app_id = web_app::GetExtensionIdFromApplicationName(
                     browser->app_name());
       // Only allow this for known applications. Some unit tests for example
       // do not have one.
       if (!app_id.empty())
         type = TYPE_WINDOWED_APP;
     }
   } else if (browser->is_app()) {
-    if (browser->is_type_panel()) {
-      if (browser->app_type() == Browser::APP_TYPE_CHILD)
-        type = TYPE_EXTENSION_PANEL;
-      else
-        type = TYPE_APP_PANEL;
-    } else {
-      type = TYPE_TABBED;
-    }
+    type = TYPE_TABBED;
     app_id = web_app::GetExtensionIdFromApplicationName(browser->app_name());
   } else {
     return NULL;
   }
   BrowserLauncherItemController* controller =
       new BrowserLauncherItemController(type,
                                         browser->window()->GetNativeWindow(),
                                         browser->tab_strip_model(),
                                         ChromeLauncherController::instance(),
                                         app_id);
   controller->Init();
   return controller;
 }
 
 void BrowserLauncherItemController::BrowserActivationStateChanged() {
   content::WebContents* active_contents = tab_model_->GetActiveWebContents();
   if (active_contents)
     UpdateAppState(active_contents);
   UpdateItemStatus();
 }
 
 string16 BrowserLauncherItemController::GetTitle() {
-  if (type() == TYPE_TABBED || type() == TYPE_EXTENSION_PANEL) {
+  if (type() == TYPE_TABBED) {
     if (tab_model_->active_index() != TabStripModel::kNoTab) {
       const content::WebContents* contents = tab_model_->GetActiveWebContents();
       if (contents)
         return contents->GetTitle();
     }
   }
   return GetAppTitle();
 }
 
 bool BrowserLauncherItemController::HasWindow(aura::Window* window) const {
@@ skipping 101 matching lines @@
     TabStripModel* tab_strip_model,
     content::WebContents* old_contents,
     content::WebContents* new_contents,
     int index) {
   launcher_controller()->UpdateAppState(
       old_contents,
       ChromeLauncherController::APP_STATE_REMOVED);
   UpdateAppState(new_contents);
 }
 
-void BrowserLauncherItemController::FaviconUpdated() {
-  UpdateLauncher(tab_model_->GetActiveWebContents());
-}
-
 void BrowserLauncherItemController::OnWindowPropertyChanged(
     aura::Window* window,
     const void* key,
     intptr_t old) {
   if (key == aura::client::kDrawAttentionKey)
     UpdateItemStatus();
 }
 
 void BrowserLauncherItemController::UpdateItemStatus() {
   if (launcher_controller()->GetPerAppInterface())
@@ skipping 21 matching lines @@
     return;  // Maintained entirely by ChromeLauncherController.
 
   if (!tab)
     return;  // Assume the window is going to be closed if there are no tabs.
 
   int item_index = launcher_model()->ItemIndexByID(launcher_id());
   if (item_index == -1)
     return;
 
   ash::LauncherItem item = launcher_model()->items()[item_index];
-  if (type() == TYPE_EXTENSION_PANEL) {
-    if (!favicon_loader_.get() || favicon_loader_->web_contents() != tab)
-      favicon_loader_.reset(new LauncherFaviconLoader(this, tab));
-
-    // Update the icon for extension panels.
-    extensions::TabHelper* extensions_tab_helper =
-        extensions::TabHelper::FromWebContents(tab);
-    gfx::ImageSkia new_image = gfx::ImageSkia::CreateFrom1xBitmap(
-        favicon_loader_->GetFavicon());
-    if (new_image.isNull() && extensions_tab_helper->GetExtensionAppIcon()) {
-      new_image = gfx::ImageSkia::CreateFrom1xBitmap(
-          *extensions_tab_helper->GetExtensionAppIcon());
-    }
-    // Only update the icon if we have a new image, or none has been set yet.
-    // This avoids flickering to an empty image when a pinned app is opened.
-    if (!new_image.isNull())
-      item.image = new_image;
-    else if (item.image.isNull())
-      item.image = extensions::IconsInfo::GetDefaultAppIcon();
-  } else {
-    DCHECK_EQ(TYPE_TABBED, type());
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    FaviconTabHelper* favicon_tab_helper =
-        FaviconTabHelper::FromWebContents(tab);
-    if (favicon_tab_helper->ShouldDisplayFavicon()) {
-      item.image = favicon_tab_helper->GetFavicon().AsImageSkia();
-      if (item.image.isNull()) {
-        item.image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
-      }
-    } else {
+  DCHECK_EQ(TYPE_TABBED, type());
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  FaviconTabHelper* favicon_tab_helper =
+      FaviconTabHelper::FromWebContents(tab);
+  if (favicon_tab_helper->ShouldDisplayFavicon()) {
+    item.image = favicon_tab_helper->GetFavicon().AsImageSkia();
+    if (item.image.isNull()) {
       item.image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
     }
+  } else {
+    item.image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
   }
   launcher_model()->Set(item_index, item);
 }
 
 void BrowserLauncherItemController::UpdateAppState(content::WebContents* tab) {
   ChromeLauncherController::AppState app_state;
 
   if (!launcher_controller()->GetPerAppInterface() &&
       tab_model_->GetIndexOfWebContents(tab) == TabStripModel::kNoTab) {
     app_state = ChromeLauncherController::APP_STATE_REMOVED;
   } else if (tab_model_->GetActiveWebContents() == tab) {
     if (ash::wm::IsActiveWindow(window_))
       app_state = ChromeLauncherController::APP_STATE_WINDOW_ACTIVE;
     else
       app_state = ChromeLauncherController::APP_STATE_ACTIVE;
   } else {
     app_state = ChromeLauncherController::APP_STATE_INACTIVE;
   }
   launcher_controller()->UpdateAppState(tab, app_state);
 }
 
 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {
   return launcher_controller()->model();
 }