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/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 base::IntToString(shell_window->session_id().id());

[sky, 2012/11/20 02:05:05]

Do you know this id is never going to conflict with a a non-panel?

[stevenjb, 2012/11/20 21:20:58]

This uses SessionID which is globally unique across a session.

[sky, 2012/11/20 22:15:51]

Indeed. But the return value from this is used in a map shared with the value
returned from 28. My question is can the two ever conflict?

[stevenjb, 2012/11/20 22:29:10]

Ahh. Apologies, excellent point. I'll put a prefix on each of them.

   return shell_window->extension()->id();
 }
 
 bool AppLauncherIdIsForApp(const std::string& app_launcher_id,

[sky, 2012/11/20 02:05:05]

Nuke this since I don't believe its used.

[stevenjb, 2012/11/20 21:20:58]

Done.

                            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 {
@@ skipping 265 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;
 }