Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(875)

Unified Diff: ui/aura/remote_window_tree_host_win.h

Issue 277753002: Makes construction of (ash)RemoteWindowTreeHostWin explicit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/view_event_test_base.cc ('k') | ui/aura/remote_window_tree_host_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/remote_window_tree_host_win.h
diff --git a/ui/aura/remote_window_tree_host_win.h b/ui/aura/remote_window_tree_host_win.h
index 0ff913e1faab28d81b8cb1e99fe08655a62eba1d..9cc7439d0103644e249c235ee910f6af1d985a3d 100644
--- a/ui/aura/remote_window_tree_host_win.h
+++ b/ui/aura/remote_window_tree_host_win.h
@@ -106,27 +106,19 @@ class AURA_EXPORT RemoteWindowTreeHostWin
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);
@@ -180,7 +172,7 @@ class AURA_EXPORT RemoteWindowTreeHostWin
bool IsForegroundWindow();
protected:
- explicit RemoteWindowTreeHostWin(const gfx::Rect& bounds);
+ RemoteWindowTreeHostWin();
virtual ~RemoteWindowTreeHostWin();
private:
« no previous file with comments | « chrome/test/base/view_event_test_base.cc ('k') | ui/aura/remote_window_tree_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698