mash: Migrate ScopedTargetRootWindow to //ash/common

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 79968ecf6f5c37f1942d14d18ca44d4879a8d057..2511c288890bbf02ec44d5482d7fa123ecd50b9d 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -111,6 +111,11 @@ class ASH_EXPORT WmShell {
     return new_window_delegate_.get();
   }
 
+  // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily.
+  void set_root_window_for_new_windows(WmWindow* root) {
+    root_window_for_new_windows_ = root;
+  }
+
   ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
 
   ShelfModel* shelf_model() { return shelf_model_.get(); }
@@ -146,9 +151,10 @@ class ASH_EXPORT WmShell {
   virtual WmWindow* GetRootWindowForDisplayId(int64_t display_id) = 0;
 
   // Returns the root window that newly created windows should be added to.
+  // Value can be temporarily overridden using ScopedRootWindowForNewWindows.
   // NOTE: this returns the root, newly created window should be added to the
   // appropriate container in the returned window.
-  virtual WmWindow* GetRootWindowForNewWindows() = 0;
+  virtual WmWindow* GetRootWindowForNewWindows();

[msw, 2016/08/02 17:22:19]

nit: virtual not needed (reorder decl&def if you make it non-virtual)

[James Cook, 2016/08/02 17:48:08]

Oops. Done.

 
   // Retuns the display info associated with |display_id|.
   // TODO(msw): Remove this when DisplayManager has been moved. crbug.com/622480
@@ -321,6 +327,7 @@ class ASH_EXPORT WmShell {
 
  private:
   friend class AcceleratorControllerTest;
+  friend class ScopedRootWindowForNewWindows;
   friend class Shell;
 
   static WmShell* instance_;
@@ -349,6 +356,10 @@ class ASH_EXPORT WmShell {
 
   base::ObserverList<LockStateObserver> lock_state_observers_;
 
+  // See comment for GetRootWindowForNewWindows().
+  WmWindow* root_window_for_new_windows_ = nullptr;
+  WmWindow* scoped_root_window_for_new_windows_ = nullptr;
+
   bool simulate_modal_window_open_for_testing_ = false;
 
 #if defined(OS_CHROMEOS)