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

chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h

Index: chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h
index d705acb7683958d40063c70f7bf3e33c59578e74..8d711f54648d949580329b83a782c4a896a47353 100644
--- a/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h
@@ -48,7 +48,7 @@ class ShellWindowLauncherController
 
   // An additional user identified by |Profile|, got added to the existing
   // session.
-  virtual void AdditionalUserAddedToSession(Profile* profile) {}
+  virtual void AdditionalUserAddedToSession(Profile* profile);
 
   // Overridden from ShellWindowRegistry::Observer:
   virtual void OnShellWindowAdded(apps::ShellWindow* shell_window) OVERRIDE;
@@ -81,7 +81,10 @@ class ShellWindowLauncherController
   ShellWindowLauncherItemController* ControllerForWindow(aura::Window* window);
 
   ChromeLauncherController* owner_;
-  apps::ShellWindowRegistry* registry_;  // Unowned convenience pointer
+  // A set of unowned ShellWindowRegistry pointers for loaded users.
+  // Note that this will only be used with multiple users in the side by side
+  // mode.
+  std::set<apps::ShellWindowRegistry*> registry_;
   aura::client::ActivationClient* activation_client_;
 
   // Map of app launcher id to controller.