[Merge M58] Fix crash whem window created before shelf creation.

chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_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 "chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "ui/aura/window.h"
 
 MultiProfileAppWindowLauncherController::
     MultiProfileAppWindowLauncherController(ChromeLauncherController* owner)
-    : ExtensionAppWindowLauncherController(owner) {}
+    : ExtensionAppWindowLauncherController(owner) {
+  // We might have already active windows.
+  extensions::AppWindowRegistry* registry =
+      extensions::AppWindowRegistry::Get(owner->profile());
+  app_window_list_.insert(app_window_list_.end(),
+                          registry->app_windows().begin(),
+                          registry->app_windows().end());
+}
 
 MultiProfileAppWindowLauncherController::
     ~MultiProfileAppWindowLauncherController() {
   // We need to remove all Registry observers for added users.
   for (AppWindowRegistryList::iterator it = multi_user_registry_.begin();
        it != multi_user_registry_.end();
        ++it)
     (*it)->RemoveObserver(this);
 }
 
@@ skipping 25 matching lines @@
          app_window->GetNativeWindow()->IsVisible()))
       RegisterApp(*it);
   }
 }
 
 void MultiProfileAppWindowLauncherController::AdditionalUserAddedToSession(
     Profile* profile) {
   // Each users AppWindowRegistry needs to be observed.
   extensions::AppWindowRegistry* registry =
       extensions::AppWindowRegistry::Get(profile);
+  DCHECK(registry->app_windows().empty());
   multi_user_registry_.push_back(registry);
   registry->AddObserver(this);
 }
 
 void MultiProfileAppWindowLauncherController::OnAppWindowAdded(
     extensions::AppWindow* app_window) {
   app_window_list_.push_back(app_window);
   Profile* profile = Profile::FromBrowserContext(app_window->browser_context());
   // If the window got created for a non active user but the user allowed to
   // teleport to the current user's desktop, we teleport it now.
@@ skipping 62 matching lines @@
     DCHECK(!other_window->browser_context()->IsOffTheRecord());
     if (manager->IsWindowOnDesktopOfUser(other_window->GetNativeWindow(),
                                          current_account_id) &&
         app_id == other_window->extension_id() &&
         app_context == other_window->browser_context()) {
       return true;
     }
   }
   return false;
 }