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

Unified Diff: remoting/host/host_user_interface.h

Issue 11886051: Turned UiStrings into a singleton so that the continue window does not depend on ChromotingHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 11 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
« no previous file with comments | « remoting/host/host_mock_objects.cc ('k') | remoting/host/host_user_interface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/host_user_interface.h
diff --git a/remoting/host/host_user_interface.h b/remoting/host/host_user_interface.h
index 3a89a064a9fc64a07919e39f3ed6d6ddaa4b8df6..d22cb6155937e2f38958d892ddff1640a008e654 100644
--- a/remoting/host/host_user_interface.h
+++ b/remoting/host/host_user_interface.h
@@ -14,6 +14,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/host_status_observer.h"
+#include "remoting/host/ui_strings.h"
namespace base {
class SingleThreadTaskRunner;
@@ -29,7 +30,8 @@ class HostUserInterface : public HostStatusObserver {
public:
HostUserInterface(
scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
+ const UiStrings& ui_strings);
virtual ~HostUserInterface();
// Initialize the OS-specific UI objects.
@@ -56,6 +58,8 @@ class HostUserInterface : public HostStatusObserver {
}
ChromotingHost* get_host() const { return host_; }
+ const UiStrings& ui_strings() const { return ui_strings_; }
+
base::SingleThreadTaskRunner* network_task_runner() const;
base::SingleThreadTaskRunner* ui_task_runner() const;
@@ -97,6 +101,9 @@ class HostUserInterface : public HostStatusObserver {
bool is_monitoring_local_inputs_;
+ // TODO(alexeypa): move |ui_strings_| to DesktopEnvironmentFactory.
+ UiStrings ui_strings_;
+
// WeakPtr used to avoid tasks accessing the client after it is deleted.
base::WeakPtrFactory<HostUserInterface> weak_factory_;
base::WeakPtr<HostUserInterface> weak_ptr_;
« no previous file with comments | « remoting/host/host_mock_objects.cc ('k') | remoting/host/host_user_interface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698