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

Unified Diff: remoting/host/me2me_desktop_environment.cc

Issue 13461029: The continue window is owned by the desktop environment now. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac. Created 7 years, 8 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
Index: remoting/host/me2me_desktop_environment.cc
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc
index 40f459c62db46e8e1dce07f0b9c137a2df403c50..2f77a748d209b71b42ced0cd50497388e07b5922 100644
--- a/remoting/host/me2me_desktop_environment.cc
+++ b/remoting/host/me2me_desktop_environment.cc
@@ -12,7 +12,6 @@
#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"
namespace remoting {
@@ -43,7 +42,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
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,
@@ -75,7 +74,7 @@ scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
input_task_runner(),
ui_task_runner(),
client_session_control,
- &ui_strings()));
+ ui_strings()));
}
} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698