Support panel titles and Icons for v1 apps

chrome/browser/ui/ash/launcher/shell_window_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/shell_window_launcher_item_controller.h"
 
 #include "ash/launcher/launcher_util.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
@@ skipping 27 matching lines @@
     : LauncherItemController(type, app_id, controller),
       app_launcher_id_(app_launcher_id) {
 }
 
 ShellWindowLauncherItemController::~ShellWindowLauncherItemController() {
 }
 
 void ShellWindowLauncherItemController::AddShellWindow(
     ShellWindow* shell_window,
     ash::LauncherItemStatus status) {
-  if (shell_window->window_type() == ShellWindow::WINDOW_TYPE_PANEL &&
-      type() != TYPE_APP_PANEL) {
+  if (shell_window->window_type_is_panel() && type() != TYPE_APP_PANEL) {
     LOG(ERROR) << "ShellWindow of type Panel added to non-panel launcher item";
   }
   if (status == ash::STATUS_ACTIVE)
     shell_windows_.push_front(shell_window);
   else
     shell_windows_.push_back(shell_window);
 }
 
 void ShellWindowLauncherItemController::RemoveShellWindowForWindow(
     aura::Window* window) {
@@ skipping 130 matching lines @@
 
 void ShellWindowLauncherItemController::RestoreOrShow(
     ShellWindow* shell_window) {
   if (shell_window->GetBaseWindow()->IsMinimized())
     shell_window->GetBaseWindow()->Restore();
   else
     shell_window->GetBaseWindow()->Show();
   // Always activate windows when shown from the launcher.
   shell_window->GetBaseWindow()->Activate();
 }