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

Unified Diff: remoting/host/continue_window_linux.cc

Issue 8624009: Refactor ContinueWindow::Show() to accept a callback parameter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac compile Created 9 years, 1 month 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/continue_window_linux.cc
diff --git a/remoting/host/continue_window_linux.cc b/remoting/host/continue_window_linux.cc
index ddd959c88983d2fe7b063b6b6ce635de055ffdc0..b84e49bbe43f73276bfe91830efdbd4b462a8e98 100644
--- a/remoting/host/continue_window_linux.cc
+++ b/remoting/host/continue_window_linux.cc
@@ -20,7 +20,8 @@ class ContinueWindowLinux : public remoting::ContinueWindow {
ContinueWindowLinux();
virtual ~ContinueWindowLinux();
- virtual void Show(remoting::ChromotingHost* host) OVERRIDE;
+ virtual void Show(remoting::ChromotingHost* host,
+ const ContinueSessionCallback& callback) OVERRIDE;
virtual void Hide() OVERRIDE;
private:
@@ -29,6 +30,7 @@ class ContinueWindowLinux : public remoting::ContinueWindow {
void CreateWindow(const UiStrings& ui_strings);
ChromotingHost* host_;
+ ContinueSessionCallback callback_;
GtkWidget* continue_window_;
DISALLOW_COPY_AND_ASSIGN(ContinueWindowLinux);
@@ -79,8 +81,10 @@ void ContinueWindowLinux::CreateWindow(const UiStrings& ui_strings) {
gtk_widget_show_all(content_area);
}
-void ContinueWindowLinux::Show(remoting::ChromotingHost* host) {
+void ContinueWindowLinux::Show(remoting::ChromotingHost* host,
+ const ContinueSessionCallback& callback) {
host_ = host;
+ callback_ = callback;
CreateWindow(host->ui_strings());
gtk_window_set_urgency_hint(GTK_WINDOW(continue_window_), TRUE);
gtk_window_present(GTK_WINDOW(continue_window_));
@@ -94,11 +98,7 @@ void ContinueWindowLinux::Hide() {
}
void ContinueWindowLinux::OnResponse(GtkWidget* dialog, int response_id) {
- if (response_id == GTK_RESPONSE_OK) {
- host_->PauseSession(false);
- } else {
- host_->Shutdown(base::Closure());
- }
+ callback_.Run(response_id == GTK_RESPONSE_OK);
Hide();
}

Powered by Google App Engine
This is Rietveld 408576698