diff options
author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 03:32:06 +0000 |
---|---|---|
committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 03:32:06 +0000 |
commit | c308f512b3dd5008cf921d575ae669e340815ddf (patch) | |
tree | 94efaf22b1e990988098953c304863bf16e6afa4 /remoting/host/me2me_desktop_environment.h | |
parent | bfb172ea12179df8deaca7cbcd4a39bb2db04ef4 (diff) | |
download | chromium_src-c308f512b3dd5008cf921d575ae669e340815ddf.zip chromium_src-c308f512b3dd5008cf921d575ae669e340815ddf.tar.gz chromium_src-c308f512b3dd5008cf921d575ae669e340815ddf.tar.bz2 |
Refactored the disconnect window such that it can be owned by the desktop environment.
This CL adds two new classes: HostWindow and HostWindowProxy. HostWindow is a non thread-safe base class for platform-specific implementations of the disconnect and continue windows. HostWindowProxy implements thread switching logic (using a ref-counted HostWindowProxy::Core).
The combination of HostWindow and HostWindowProxy allows DesktopEnvironment to create the disconnect window on the network thread and run it on the UI thread.
This is the 1st CL (out of 2) that deprecates the HostUserInterface class and moves responsibility to create the local UI to the corresponding DesktopEnvironment instances. The follow up CL will migrate the continue window logic.
BUG=104544
Review URL: https://chromiumcodereview.appspot.com/13212009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/me2me_desktop_environment.h')
-rw-r--r-- | remoting/host/me2me_desktop_environment.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/remoting/host/me2me_desktop_environment.h b/remoting/host/me2me_desktop_environment.h index 97f63bf..5be2565 100644 --- a/remoting/host/me2me_desktop_environment.h +++ b/remoting/host/me2me_desktop_environment.h @@ -25,7 +25,8 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment { scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, - base::WeakPtr<ClientSessionControl> client_session_control); + base::WeakPtr<ClientSessionControl> client_session_control, + const UiStrings* ui_strings); private: DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironment); @@ -37,7 +38,8 @@ class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory { Me2MeDesktopEnvironmentFactory( scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, - scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner); + scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, + const UiStrings& ui_strings); virtual ~Me2MeDesktopEnvironmentFactory(); // DesktopEnvironmentFactory interface. |