Allow Chrome apps to create Ash Panels (apps v2)

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 <algorithm>
 
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
+#include "base/string_number_conversions.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "ui/aura/client/activation_client.h"
 
 namespace {
 
-// Currently apps have a single launcher item, so the launcher id is the
-// same as the app id. In the future, this may not be true (e.g. for panels).
 std::string GetAppLauncherId(ShellWindow* shell_window) {
+  if (shell_window->window_type() == ShellWindow::WINDOW_TYPE_PANEL)
+    return StringPrintf("panel:%d", shell_window->session_id().id());

[stevenjb, 2012/11/29 02:30:38]

Fixed this to make panel identifiers unique. We do not rely on this id matching
shell_window->session_id() anywhere.

   return shell_window->extension()->id();
 }
 
-bool AppLauncherIdIsForApp(const std::string& app_launcher_id,
-                           const std::string& app_id) {
-  return app_launcher_id == app_id;
-}
-
 // Functor for std::find_if used in AppLauncherItemController.
 class ShellWindowHasWindow {
  public:
   explicit ShellWindowHasWindow(aura::Window* window) : window_(window) { }
 
   bool operator()(ShellWindow* shell_window) const {
     return shell_window->GetNativeWindow() == window_;
   }
 
  private:
@@ skipping 64 matching lines @@
   virtual bool IsOpen() const OVERRIDE {
     return !shell_windows_.empty();
   }
 
   virtual void Launch(int event_flags) OVERRIDE {
     launcher_controller()->LaunchApp(app_id(), ui::EF_NONE);
   }
 
   virtual void Activate() OVERRIDE {
     DCHECK(!shell_windows_.empty());
-    ShowAndActivate(shell_windows_.front());
+    shell_windows_.front()->GetBaseWindow()->Activate();
   }
 
   virtual void Close() OVERRIDE {
     // Note: Closing windows may affect the contents of shell_windows_.
     ShellWindowList windows_to_close = shell_windows_;
     for (ShellWindowList::iterator iter = windows_to_close.begin();
          iter != windows_to_close.end(); ++iter) {
       (*iter)->GetBaseWindow()->Close();
     }
   }
 
   // Behavior for app windows:
   // * One window: Toggle minimization when clicked.
   // * Multiple windows:
   // ** If the first window is not active, activate it.
   // ** Otherwise activate the next window.
   virtual void Clicked() OVERRIDE {
     if (shell_windows_.empty())
       return;
     ShellWindow* first_window = shell_windows_.front();
     if (shell_windows_.size() == 1) {
       if (first_window->GetBaseWindow()->IsActive())
         first_window->GetBaseWindow()->Minimize();
       else
-        ShowAndActivate(first_window);
+        RestoreOrShow(first_window);
     } else {
       if (!first_window->GetBaseWindow()->IsActive()) {
-        ShowAndActivate(first_window);
+        RestoreOrShow(first_window);
       } else {
         shell_windows_.pop_front();
         shell_windows_.push_back(first_window);
-        ShowAndActivate(shell_windows_.front());
+        RestoreOrShow(shell_windows_.front());
       }
     }
   }
 
   virtual void OnRemoved() OVERRIDE {
   }
 
   virtual void LauncherItemChanged(int model_index,
                                    const ash::LauncherItem& old_item) OVERRIDE {
   }
 
   size_t shell_window_count() const { return shell_windows_.size(); }
 
  private:
   typedef std::list<ShellWindow*> ShellWindowList;
 
-  void ShowAndActivate(ShellWindow* shell_window) {
-    shell_window->GetBaseWindow()->Show();
+  void 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();
   }
 
   // List of associated shell windows in activation order.
   ShellWindowList shell_windows_;
 
   // The launcher id associated with this set of windows. There is one
   // AppLauncherItemController for each |app_launcher_id_|.
   const std::string app_launcher_id_;
 
@@ skipping 126 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;
 }