Makes construction of (ash)RemoteWindowTreeHostWin explicit

ui/aura/remote_window_tree_host_win.h

 // 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.
 
 #ifndef UI_AURA_REMOTE_WINDOW_TREE_HOST_WIN_H_
 #define UI_AURA_REMOTE_WINDOW_TREE_HOST_WIN_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 88 matching lines @@
 AURA_EXPORT void HandleMetroExit();
 
 // WindowTreeHost implementaton that receives events from a different
 // process. In the case of Windows this is the Windows 8 (aka Metro)
 // frontend process, which forwards input events to this class.
 class AURA_EXPORT RemoteWindowTreeHostWin
     : public WindowTreeHost,
       public ui::EventSource,
       public ui::internal::RemoteInputMethodDelegateWin {
  public:
-  // Returns the only RemoteWindowTreeHostWin, if this is the first time
-  // this function is called and the instance have never set by SetInstance,
-  // it will call Create() wiht empty bounds.
+  // Returns the current RemoteWindowTreeHostWin. This does *not* create a
+  // RemoteWindowTreeHostWin.
   static RemoteWindowTreeHostWin* Instance();
 
-  // Manually sets the instance to be used as a return value of |Instance()|
-  // method above. This should not be called if the instance has already
-  // been set or created, and doing so will result in CHECK failure.
-  static void SetInstance(RemoteWindowTreeHostWin* instance);
-
   // Returns true if there is a RemoteWindowTreeHostWin and it has a valid
   // HWND. A return value of false typically indicates we're not in metro mode.
   static bool IsValid();
 
-  // Sets the handle to the remote window and the scale factor. The
-  // |remote_window| is the actual window owned by the viewer process. Call
-  // this before Connected() for some customers like input method
-  // initialization which needs the handle.
-  // |device_scale| indicates the Windows 8 dpi scale.
-  void InitializeRemoteWindowAndScaleFactor(HWND remote_window,
-                                            float device_scale);
+  // Sets the handle to the remote window. The |remote_window| is the actual
+  // window owned by the viewer process. Call this before Connected() for some
+  // customers like input method initialization which needs the handle.
+  void SetRemoteWindowHandle(HWND remote_window);
+  HWND remote_window() { return remote_window_; }
 
   // The |host| can be used when we need to send a message to it.
   void Connected(IPC::Sender* host);
   // Called when the remote process has closed its IPC connection.
   void Disconnected();
 
   // Called when we have a message from the remote process.
   bool OnMessageReceived(const IPC::Message& message);
 
   void HandleOpenURLOnDesktop(const base::FilePath& shortcut,
@@ skipping 33 matching lines @@
   void HandleWindowSizeChanged(uint32 width, uint32 height);
 
   // Returns the active ASH root window.
   Window* GetAshWindow();
 
   // Returns true if the remote window is the foreground window according to the
   // OS.
   bool IsForegroundWindow();
 
  protected:
-  explicit RemoteWindowTreeHostWin(const gfx::Rect& bounds);
+  RemoteWindowTreeHostWin();
   virtual ~RemoteWindowTreeHostWin();
 
  private:
   // IPC message handing methods:
   void OnMouseMoved(int32 x, int32 y, int32 flags);
   void OnMouseButton(const MetroViewerHostMsg_MouseButtonParams& params);
   void OnKeyDown(uint32 vkey,
                  uint32 repeat_count,
                  uint32 scan_code,
                  uint32 flags);
@@ skipping 108 matching lines @@
 
   // Current size of this root window.
   gfx::Size window_size_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoteWindowTreeHostWin);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_REMOTE_WINDOW_TREE_HOST_WIN_H_