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

Unified Diff: remoting/host/it2me_host_user_interface.cc

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/it2me_host_user_interface.h ('k') | remoting/host/plugin/host_script_object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/it2me_host_user_interface.cc
diff --git a/remoting/host/it2me_host_user_interface.cc b/remoting/host/it2me_host_user_interface.cc
index 3f0653bc1fbd0f768eadd1422ae6a142f1d59447..119143ec3b9dbee3eaed053cf5bd25ddf60b7b37 100644
--- a/remoting/host/it2me_host_user_interface.cc
+++ b/remoting/host/it2me_host_user_interface.cc
@@ -25,8 +25,9 @@ namespace remoting {
It2MeHostUserInterface::It2MeHostUserInterface(
scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
- : HostUserInterface(network_task_runner, ui_task_runner),
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
+ const UiStrings& ui_strings)
+ : HostUserInterface(network_task_runner, ui_task_runner, ui_strings),
ALLOW_THIS_IN_INITIALIZER_LIST(timer_weak_factory_(this)) {
DCHECK(ui_task_runner->BelongsToCurrentThread());
}
@@ -41,7 +42,7 @@ void It2MeHostUserInterface::Init() {
DCHECK(ui_task_runner()->BelongsToCurrentThread());
HostUserInterface::Init();
- continue_window_ = ContinueWindow::Create();
+ continue_window_ = ContinueWindow::Create(&ui_strings());
}
void It2MeHostUserInterface::ProcessOnClientAuthenticated(
@@ -97,7 +98,7 @@ void It2MeHostUserInterface::ShowContinueWindow(bool show) {
DCHECK(ui_task_runner()->BelongsToCurrentThread());
if (show) {
- continue_window_->Show(get_host(), base::Bind(
+ continue_window_->Show(base::Bind(
&It2MeHostUserInterface::ContinueSession, base::Unretained(this)));
} else {
continue_window_->Hide();
« no previous file with comments | « remoting/host/it2me_host_user_interface.h ('k') | remoting/host/plugin/host_script_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698