| Index: ui/aura/remote_root_window_host_win.h
|
| diff --git a/ui/aura/remote_root_window_host_win.h b/ui/aura/remote_root_window_host_win.h
|
| index a295109a8d5ab8f9f76a0265364b1e564e4da691..5be111761ce42886d087312a08c461500e427ab8 100644
|
| --- a/ui/aura/remote_root_window_host_win.h
|
| +++ b/ui/aura/remote_root_window_host_win.h
|
| @@ -94,17 +94,17 @@ AURA_EXPORT void HandleActivateDesktop(
|
| const base::FilePath& shortcut,
|
| bool ash_exit);
|
|
|
| -// RootWindowHost implementaton that receives events from a different
|
| +// 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 RemoteRootWindowHostWin
|
| - : public RootWindowHost,
|
| +class AURA_EXPORT RemoteWindowTreeHostWin
|
| + : public WindowTreeHost,
|
| public ui::internal::RemoteInputMethodDelegateWin {
|
| public:
|
| - // Returns the only RemoteRootWindowHostWin, if this is the first time
|
| + // Returns the only RemoteWindowTreeHostWin, if this is the first time
|
| // this function is called, it will call Create() wiht empty bounds.
|
| - static RemoteRootWindowHostWin* Instance();
|
| - static RemoteRootWindowHostWin* Create(const gfx::Rect& bounds);
|
| + static RemoteWindowTreeHostWin* Instance();
|
| + static RemoteWindowTreeHostWin* Create(const gfx::Rect& bounds);
|
|
|
| // Called when the remote process has established its IPC connection.
|
| // The |host| can be used when we need to send a message to it and
|
| @@ -159,8 +159,8 @@ class AURA_EXPORT RemoteRootWindowHostWin
|
| bool IsForegroundWindow();
|
|
|
| private:
|
| - explicit RemoteRootWindowHostWin(const gfx::Rect& bounds);
|
| - virtual ~RemoteRootWindowHostWin();
|
| + explicit RemoteWindowTreeHostWin(const gfx::Rect& bounds);
|
| + virtual ~RemoteWindowTreeHostWin();
|
|
|
| // IPC message handing methods:
|
| void OnMouseMoved(int32 x, int32 y, int32 flags);
|
| @@ -201,7 +201,7 @@ class AURA_EXPORT RemoteRootWindowHostWin
|
| void OnImeTextCommitted(const base::string16& text);
|
| void OnImeInputSourceChanged(uint16 language_id, bool is_ime);
|
|
|
| - // RootWindowHost overrides:
|
| + // WindowTreeHost overrides:
|
| virtual RootWindow* GetRootWindow() OVERRIDE;
|
| virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
|
| virtual void Show() OVERRIDE;
|
| @@ -231,7 +231,7 @@ class AURA_EXPORT RemoteRootWindowHostWin
|
| const std::vector<gfx::Rect>& composition_character_bounds) OVERRIDE;
|
|
|
| // Helper function to dispatch a keyboard message to the desired target.
|
| - // The default target is the RootWindowHostDelegate. For nested message loop
|
| + // The default target is the WindowTreeHostDelegate. For nested message loop
|
| // invocations we post a synthetic keyboard message directly into the message
|
| // loop. The dispatcher for the nested loop would then decide how this
|
| // message is routed.
|
| @@ -284,7 +284,7 @@ class AURA_EXPORT RemoteRootWindowHostWin
|
| // Current size of this root window.
|
| gfx::Size window_size_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(RemoteRootWindowHostWin);
|
| + DISALLOW_COPY_AND_ASSIGN(RemoteWindowTreeHostWin);
|
| };
|
|
|
| } // namespace aura
|
|
|