Fixing V2 application issues on M-32 for the M-31 legacy multi user mode.

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 "apps/shell_window.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.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/host_desktop.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/root_window.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/ash/multi_user_window_manager.h"
+#endif
+
 using apps::ShellWindow;
 
 namespace {
 
 std::string GetAppLauncherId(ShellWindow* shell_window) {
   if (shell_window->window_type_is_panel())
     return base::StringPrintf("panel:%d", shell_window->session_id().id());
   return shell_window->extension()->id();
 }
 
 bool ControlsWindow(aura::Window* window) {
   return chrome::GetHostDesktopTypeForNativeWindow(window) ==
       chrome::HOST_DESKTOP_TYPE_ASH;
 }
 
 }  // namespace
 
 ShellWindowLauncherController::ShellWindowLauncherController(
     ChromeLauncherController* owner)
     : owner_(owner),
-      registry_(apps::ShellWindowRegistry::Get(owner->profile())),
       activation_client_(NULL) {
-  registry_->AddObserver(this);
+  apps::ShellWindowRegistry* registry =
+      apps::ShellWindowRegistry::Get(owner->profile());
+  registry_.insert(registry);
+  registry->AddObserver(this);
   if (ash::Shell::HasInstance()) {
     if (ash::Shell::GetInstance()->GetPrimaryRootWindow()) {
       activation_client_ = aura::client::GetActivationClient(
           ash::Shell::GetInstance()->GetPrimaryRootWindow());
       if (activation_client_)
         activation_client_->AddObserver(this);
     }
   }
 }
 
 ShellWindowLauncherController::~ShellWindowLauncherController() {
-  registry_->RemoveObserver(this);
+  for (std::set<apps::ShellWindowRegistry*>::iterator it = registry_.begin();
+      it != registry_.end(); ++it)
+    (*it)->RemoveObserver(this);
+
   if (activation_client_)
     activation_client_->RemoveObserver(this);
   for (WindowToAppLauncherIdMap::iterator iter =
            window_to_app_launcher_id_map_.begin();
        iter != window_to_app_launcher_id_map_.end(); ++iter) {
     iter->first->RemoveObserver(this);
   }
 }
 
+void ShellWindowLauncherController::AdditionalUserAddedToSession(
+    Profile* profile) {
+#if defined(OS_CHROMEOS)
+  // TODO(skuhne): This was added for the legacy side by side mode in M32. If
+  // this mode gets no longer pursued this special case can be removed.
+  if (chrome::MultiUserWindowManager::GetMultiProfileMode() !=
+          chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_MIXED)
+    return;
+
+  apps::ShellWindowRegistry* registry = apps::ShellWindowRegistry::Get(profile);
+  if (registry_.find(registry) != registry_.end())
+    return;
+
+  registry->AddObserver(this);
+  registry_.insert(registry);
+#endif
+}
+
 void ShellWindowLauncherController::OnShellWindowAdded(
     ShellWindow* shell_window) {
   if (!ControlsWindow(shell_window->GetNativeWindow()))
     return;
   RegisterApp(shell_window);
 }
 
 void ShellWindowLauncherController::OnShellWindowIconChanged(
     ShellWindow* shell_window) {
   if (!ControlsWindow(shell_window->GetNativeWindow()))
@@ skipping 118 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;
 }