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

Unified Diff: remoting/host/continue_window_gtk.cc

Issue 10386181: Fix remoting_unittests compilation with aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « build/all.gyp ('k') | remoting/host/continue_window_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/continue_window_gtk.cc
diff --git a/remoting/host/continue_window_linux.cc b/remoting/host/continue_window_gtk.cc
similarity index 81%
rename from remoting/host/continue_window_linux.cc
rename to remoting/host/continue_window_gtk.cc
index d166710278233ef3fe99259bc577ca4236c411e2..7301657630eed00a9cb15317366d229a6b16f536 100644
--- a/remoting/host/continue_window_linux.cc
+++ b/remoting/host/continue_window_gtk.cc
@@ -15,17 +15,17 @@
namespace remoting {
-class ContinueWindowLinux : public remoting::ContinueWindow {
+class ContinueWindowGtk : public remoting::ContinueWindow {
public:
- ContinueWindowLinux();
- virtual ~ContinueWindowLinux();
+ ContinueWindowGtk();
+ virtual ~ContinueWindowGtk();
virtual void Show(remoting::ChromotingHost* host,
const ContinueSessionCallback& callback) OVERRIDE;
virtual void Hide() OVERRIDE;
private:
- CHROMEGTK_CALLBACK_1(ContinueWindowLinux, void, OnResponse, int);
+ CHROMEGTK_CALLBACK_1(ContinueWindowGtk, void, OnResponse, int);
void CreateWindow(const UiStrings& ui_strings);
@@ -33,18 +33,18 @@ class ContinueWindowLinux : public remoting::ContinueWindow {
ContinueSessionCallback callback_;
GtkWidget* continue_window_;
- DISALLOW_COPY_AND_ASSIGN(ContinueWindowLinux);
+ DISALLOW_COPY_AND_ASSIGN(ContinueWindowGtk);
};
-ContinueWindowLinux::ContinueWindowLinux()
+ContinueWindowGtk::ContinueWindowGtk()
: host_(NULL),
continue_window_(NULL) {
}
-ContinueWindowLinux::~ContinueWindowLinux() {
+ContinueWindowGtk::~ContinueWindowGtk() {
}
-void ContinueWindowLinux::CreateWindow(const UiStrings& ui_strings) {
+void ContinueWindowGtk::CreateWindow(const UiStrings& ui_strings) {
if (continue_window_) return;
continue_window_ = gtk_dialog_new_with_buttons(
@@ -81,7 +81,7 @@ void ContinueWindowLinux::CreateWindow(const UiStrings& ui_strings) {
gtk_widget_show_all(content_area);
}
-void ContinueWindowLinux::Show(remoting::ChromotingHost* host,
+void ContinueWindowGtk::Show(remoting::ChromotingHost* host,
const ContinueSessionCallback& callback) {
host_ = host;
callback_ = callback;
@@ -90,20 +90,20 @@ void ContinueWindowLinux::Show(remoting::ChromotingHost* host,
gtk_window_present(GTK_WINDOW(continue_window_));
}
-void ContinueWindowLinux::Hide() {
+void ContinueWindowGtk::Hide() {
if (continue_window_) {
gtk_widget_destroy(continue_window_);
continue_window_ = NULL;
}
}
-void ContinueWindowLinux::OnResponse(GtkWidget* dialog, int response_id) {
+void ContinueWindowGtk::OnResponse(GtkWidget* dialog, int response_id) {
callback_.Run(response_id == GTK_RESPONSE_OK);
Hide();
}
scoped_ptr<ContinueWindow> ContinueWindow::Create() {
- return scoped_ptr<ContinueWindow>(new ContinueWindowLinux());
+ return scoped_ptr<ContinueWindow>(new ContinueWindowGtk());
}
} // namespace remoting
« no previous file with comments | « build/all.gyp ('k') | remoting/host/continue_window_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698