Index: remoting/host/it2me_desktop_environment.cc |
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/it2me_desktop_environment.cc |
similarity index 56% |
copy from remoting/host/me2me_desktop_environment.cc |
copy to remoting/host/it2me_desktop_environment.cc |
index 40f459c62db46e8e1dce07f0b9c137a2df403c50..6eaef4970e47631e78ecb735393cdb7ad59403fe 100644 |
--- a/remoting/host/me2me_desktop_environment.cc |
+++ b/remoting/host/it2me_desktop_environment.cc |
@@ -1,58 +1,44 @@ |
-// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Copyright 2013 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. |
-#include "remoting/host/me2me_desktop_environment.h" |
+#include "remoting/host/it2me_desktop_environment.h" |
#include "base/logging.h" |
#include "base/single_thread_task_runner.h" |
-#include "media/video/capture/screen/screen_capturer.h" |
#include "remoting/host/client_session_control.h" |
-#include "remoting/host/desktop_resizer.h" |
#include "remoting/host/host_window.h" |
-#include "remoting/host/resizing_host_observer.h" |
-#include "remoting/host/screen_controls.h" |
-#include "remoting/host/ui_strings.h" |
+#include "remoting/host/host_window_proxy.h" |
namespace remoting { |
-Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() { |
+It2MeDesktopEnvironment::~It2MeDesktopEnvironment() { |
DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
} |
-scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() { |
- DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
- |
- return scoped_ptr<ScreenControls>( |
- new ResizingHostObserver(DesktopResizer::Create())); |
-} |
- |
-scoped_ptr<media::ScreenCapturer> |
-Me2MeDesktopEnvironment::CreateVideoCapturer() { |
- DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
- |
-#if defined(OS_LINUX) |
- return media::ScreenCapturer::CreateWithXDamage(true); |
-#else // !defined(OS_LINUX) |
- return media::ScreenCapturer::Create(); |
-#endif // !defined(OS_LINUX) |
-} |
- |
-Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( |
+It2MeDesktopEnvironment::It2MeDesktopEnvironment( |
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, |
- const UiStrings* ui_strings) |
+ const UiStrings& ui_strings) |
: BasicDesktopEnvironment(caller_task_runner, |
input_task_runner, |
ui_task_runner, |
client_session_control, |
ui_strings) { |
DCHECK(caller_task_runner->BelongsToCurrentThread()); |
+ |
+ // Create the Continue window. |
+ continue_window_ = HostWindow::CreateContinueWindow(ui_strings); |
+ continue_window_.reset(new HostWindowProxy( |
+ caller_task_runner, |
+ ui_task_runner, |
+ continue_window_.Pass())); |
+ continue_window_->Start(client_session_control); |
} |
-Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory( |
+It2MeDesktopEnvironmentFactory::It2MeDesktopEnvironmentFactory( |
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
@@ -63,19 +49,19 @@ Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory( |
ui_strings) { |
} |
-Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() { |
+It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() { |
} |
-scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( |
+scoped_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create( |
base::WeakPtr<ClientSessionControl> client_session_control) { |
DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
return scoped_ptr<DesktopEnvironment>( |
- new Me2MeDesktopEnvironment(caller_task_runner(), |
+ new It2MeDesktopEnvironment(caller_task_runner(), |
input_task_runner(), |
ui_task_runner(), |
client_session_control, |
- &ui_strings())); |
+ ui_strings())); |
} |
} // namespace remoting |