Add the ability to load multiple apps into app_shell.

extensions/shell/browser/shell_desktop_controller.cc

 // Copyright 2014 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 "extensions/shell/browser/shell_desktop_controller.h"
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/shell/browser/shell_app_delegate.h"
 #include "extensions/shell/browser/shell_app_window_client.h"
 #include "extensions/shell/common/switches.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 136 matching lines @@
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppsFocusRules);
 };
 
 }  // namespace
 
 ShellDesktopController::ShellDesktopController()
-    : app_window_client_(new ShellAppWindowClient), app_window_(NULL) {
+    : app_window_client_(new ShellAppWindowClient) {
   extensions::AppWindowClient::Set(app_window_client_.get());
 
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       AddObserver(this);
   display_configurator_.reset(new ui::DisplayConfigurator);
   display_configurator_->Init(false);
   display_configurator_->ForceInitialConfigure(0);
   display_configurator_->AddObserver(this);
 #endif
@@ skipping 10 matching lines @@
   extensions::AppWindowClient::Set(NULL);
 }
 
 aura::WindowTreeHost* ShellDesktopController::GetHost() {
   return host_.get();
 }
 
 AppWindow* ShellDesktopController::CreateAppWindow(
     content::BrowserContext* context,
     const Extension* extension) {
-  app_window_ = new AppWindow(context, new ShellAppDelegate, extension);
-  return app_window_;
+  app_windows_.push_back(
+      new AppWindow(context, new ShellAppDelegate, extension));
+  return app_windows_.back();
 }
 
 void ShellDesktopController::AddAppWindow(aura::Window* window) {

[James Cook, 2014/10/23 21:29:53]

Aside (not for this CL): The create/add/remove cycle for AppWindow vs.
NativeAppWindow vs. aura::Window is very confusing. I should clean this up some
day.

   aura::Window* root_window = GetHost()->window();
   root_window->AddChild(window);
 }
 
+void ShellDesktopController::RemoveAppWindow(AppWindow* window) {
+  auto iter = std::find(app_windows_.begin(), app_windows_.end(), window);
+  DCHECK(iter != app_windows_.end());
+  app_windows_.erase(iter);
+}
+
 void ShellDesktopController::CloseAppWindows() {
-  if (app_window_) {
-    app_window_->GetBaseWindow()->Close();  // Close() deletes |app_window_|.
-    app_window_ = NULL;
-  }
+  // Create a copy of the window vector, because closing the windows will
+  // trigger RemoveAppWindow, which will invalidate the iterator.
+  // This vector should be small enough that this should not be an issue.
+  std::vector<AppWindow*> app_windows(app_windows_);
+  for (AppWindow* app_window : app_windows)
+    app_window->GetBaseWindow()->Close();  // Close() deletes |app_window_|.

[James Cook, 2014/10/23 21:29:53]

|app_window_| -> |app_window|

[lfg, 2014/10/23 22:04:05]

Done.

+  app_windows_.clear();
 }
 
 aura::Window* ShellDesktopController::GetDefaultParent(
     aura::Window* context,
     aura::Window* window,
     const gfx::Rect& bounds) {
   return host_->window();
 }
 
 #if defined(OS_CHROMEOS)
@@ skipping 125 matching lines @@
   if (displays.empty())
     return gfx::Size();
   const ui::DisplayMode* mode = displays[0].display->current_mode();
   return mode ? mode->size() : gfx::Size();
 #else
   return gfx::Size();
 #endif
 }
 
 }  // namespace extensions