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

Side by Side Diff: remoting/host/continue_window_linux.cc

Issue 7569012: gtk: Use gtk_dialog_get_content_area() throughout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/input_window_dialog_gtk.cc ('k') | remoting/host/disconnect_window_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/continue_window.h" 5 #include "remoting/host/continue_window.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 GTK_RESPONSE_OK); 55 GTK_RESPONSE_OK);
56 gtk_window_set_resizable(GTK_WINDOW(continue_window_), FALSE); 56 gtk_window_set_resizable(GTK_WINDOW(continue_window_), FALSE);
57 57
58 // Set always-on-top, otherwise this window tends to be obscured by the 58 // Set always-on-top, otherwise this window tends to be obscured by the
59 // DisconnectWindow. 59 // DisconnectWindow.
60 gtk_window_set_keep_above(GTK_WINDOW(continue_window_), TRUE); 60 gtk_window_set_keep_above(GTK_WINDOW(continue_window_), TRUE);
61 61
62 g_signal_connect(continue_window_, "response", 62 g_signal_connect(continue_window_, "response",
63 G_CALLBACK(OnResponseThunk), this); 63 G_CALLBACK(OnResponseThunk), this);
64 64
65 GtkWidget* content_area = GTK_DIALOG(continue_window_)->vbox; 65 GtkWidget* content_area =
66 gtk_dialog_get_content_area(GTK_DIALOG(continue_window_));
66 67
67 GtkWidget* text_label = gtk_label_new(kMessage); 68 GtkWidget* text_label = gtk_label_new(kMessage);
68 gtk_label_set_line_wrap(GTK_LABEL(text_label), TRUE); 69 gtk_label_set_line_wrap(GTK_LABEL(text_label), TRUE);
69 // TODO(lambroslambrou): Fix magic numbers, as in disconnect_window_linux.cc. 70 // TODO(lambroslambrou): Fix magic numbers, as in disconnect_window_linux.cc.
70 gtk_misc_set_padding(GTK_MISC(text_label), 12, 12); 71 gtk_misc_set_padding(GTK_MISC(text_label), 12, 12);
71 gtk_container_add(GTK_CONTAINER(content_area), text_label); 72 gtk_container_add(GTK_CONTAINER(content_area), text_label);
72 73
73 gtk_widget_show_all(content_area); 74 gtk_widget_show_all(content_area);
74 } 75 }
75 76
(...skipping 18 matching lines...) Expand all
94 host_->Shutdown(NULL); 95 host_->Shutdown(NULL);
95 } 96 }
96 Hide(); 97 Hide();
97 } 98 }
98 99
99 ContinueWindow* ContinueWindow::Create() { 100 ContinueWindow* ContinueWindow::Create() {
100 return new ContinueWindowLinux(); 101 return new ContinueWindowLinux();
101 } 102 }
102 103
103 } // namespace remoting 104 } // namespace remoting
OLDNEW
« no previous file with comments | « chrome/browser/ui/input_window_dialog_gtk.cc ('k') | remoting/host/disconnect_window_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698