Support panel titles and Icons for v1 apps

chrome/browser/ui/ash/launcher/shell_window_launcher_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_controller.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "ui/aura/client/activation_client.h"
 
 namespace {
 
 std::string GetAppLauncherId(ShellWindow* shell_window) {
-  if (shell_window->window_type() == ShellWindow::WINDOW_TYPE_PANEL)
+  if (shell_window->window_type_is_panel())
     return StringPrintf("panel:%d", shell_window->session_id().id());
   return shell_window->extension()->id();
 }
 
 }  // namespace
 
 ShellWindowLauncherController::ShellWindowLauncherController(
     ChromeLauncherController* owner)
     : owner_(owner),
       registry_(extensions::ShellWindowRegistry::Get(owner->profile())),
@@ skipping 38 matching lines @@
   ash::LauncherItemStatus status = ash::wm::IsActiveWindow(window) ?
       ash::STATUS_ACTIVE : ash::STATUS_RUNNING;
   AppControllerMap::iterator iter = app_controller_map_.find(app_launcher_id);
   ash::LauncherID launcher_id = 0;
   if (iter != app_controller_map_.end()) {
     ShellWindowLauncherItemController* controller = iter->second;
     DCHECK(controller->app_id() == app_id);
     launcher_id = controller->launcher_id();
     controller->AddShellWindow(shell_window, status);
   } else {
-    LauncherItemController::Type type =
-        shell_window->window_type() == ShellWindow::WINDOW_TYPE_PANEL
+    LauncherItemController::Type type = shell_window->window_type_is_panel()
         ? LauncherItemController::TYPE_APP_PANEL
         : LauncherItemController::TYPE_APP;
     ShellWindowLauncherItemController* controller =
         new ShellWindowLauncherItemController(
             type, app_launcher_id, app_id, owner_);
     controller->AddShellWindow(shell_window, status);
     // If the app launcher id is not unique, and there is already a launcher
     // item for this app id (e.g. pinned), use that launcher item.
     if (app_launcher_id == app_id)
       launcher_id = owner_->GetLauncherIDForAppID(app_id);
@@ skipping 75 matching lines @@
   WindowToAppLauncherIdMap::iterator iter1 =
       window_to_app_launcher_id_map_.find(window);
   if (iter1 == window_to_app_launcher_id_map_.end())
     return NULL;
   std::string app_launcher_id = iter1->second;
   AppControllerMap::iterator iter2 = app_controller_map_.find(app_launcher_id);
   if (iter2 == app_controller_map_.end())
     return NULL;
   return iter2->second;
 }