Index: remoting/host/basic_desktop_environment.h |
diff --git a/remoting/host/basic_desktop_environment.h b/remoting/host/basic_desktop_environment.h |
index f5de55b907b2e2b773bce0108096a39493e545d8..6441bf634efb6eea7eb6bf1dd3c4e1aa7fcbba0c 100644 |
--- a/remoting/host/basic_desktop_environment.h |
+++ b/remoting/host/basic_desktop_environment.h |
@@ -8,6 +8,7 @@ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/ref_counted.h" |
+#include "base/memory/scoped_ptr.h" |
#include "remoting/host/desktop_environment.h" |
#include "remoting/host/ui_strings.h" |
@@ -38,7 +39,7 @@ class BasicDesktopEnvironment : public DesktopEnvironment { |
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); |
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const { |
return caller_task_runner_; |
@@ -52,8 +53,6 @@ class BasicDesktopEnvironment : public DesktopEnvironment { |
return ui_task_runner_; |
} |
- const UiStrings* ui_strings() const { return ui_strings_; } |
- |
private: |
// Task runner on which methods of DesktopEnvironment interface should be |
// called. |
@@ -71,9 +70,6 @@ class BasicDesktopEnvironment : public DesktopEnvironment { |
// Notifies the client session about the local mouse movements. |
scoped_ptr<LocalInputMonitor> local_input_monitor_; |
- // Points to the localized UI strings. |
- const UiStrings* ui_strings_; |
- |
DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironment); |
}; |