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

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

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « remoting/host/config_file_watcher.cc ('k') | remoting/host/continue_window_win.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <gtk/gtk.h> 5 #include <gtk/gtk.h>
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "remoting/base/string_resources.h" 10 #include "remoting/base/string_resources.h"
(...skipping 17 matching lines...) Expand all
28 void CreateWindow(); 28 void CreateWindow();
29 29
30 CHROMEG_CALLBACK_1(ContinueWindowGtk, void, OnResponse, GtkDialog*, int); 30 CHROMEG_CALLBACK_1(ContinueWindowGtk, void, OnResponse, GtkDialog*, int);
31 31
32 GtkWidget* continue_window_; 32 GtkWidget* continue_window_;
33 33
34 DISALLOW_COPY_AND_ASSIGN(ContinueWindowGtk); 34 DISALLOW_COPY_AND_ASSIGN(ContinueWindowGtk);
35 }; 35 };
36 36
37 ContinueWindowGtk::ContinueWindowGtk() 37 ContinueWindowGtk::ContinueWindowGtk()
38 : continue_window_(NULL) { 38 : continue_window_(nullptr) {
39 } 39 }
40 40
41 ContinueWindowGtk::~ContinueWindowGtk() { 41 ContinueWindowGtk::~ContinueWindowGtk() {
42 if (continue_window_) { 42 if (continue_window_) {
43 gtk_widget_destroy(continue_window_); 43 gtk_widget_destroy(continue_window_);
44 continue_window_ = NULL; 44 continue_window_ = nullptr;
45 } 45 }
46 } 46 }
47 47
48 void ContinueWindowGtk::ShowUi() { 48 void ContinueWindowGtk::ShowUi() {
49 DCHECK(CalledOnValidThread()); 49 DCHECK(CalledOnValidThread());
50 DCHECK(!continue_window_); 50 DCHECK(!continue_window_);
51 51
52 CreateWindow(); 52 CreateWindow();
53 gtk_window_set_urgency_hint(GTK_WINDOW(continue_window_), TRUE); 53 gtk_window_set_urgency_hint(GTK_WINDOW(continue_window_), TRUE);
54 gtk_window_present(GTK_WINDOW(continue_window_)); 54 gtk_window_present(GTK_WINDOW(continue_window_));
55 } 55 }
56 56
57 void ContinueWindowGtk::HideUi() { 57 void ContinueWindowGtk::HideUi() {
58 DCHECK(CalledOnValidThread()); 58 DCHECK(CalledOnValidThread());
59 59
60 if (continue_window_) { 60 if (continue_window_) {
61 gtk_widget_destroy(continue_window_); 61 gtk_widget_destroy(continue_window_);
62 continue_window_ = NULL; 62 continue_window_ = nullptr;
63 } 63 }
64 } 64 }
65 65
66 void ContinueWindowGtk::CreateWindow() { 66 void ContinueWindowGtk::CreateWindow() {
67 DCHECK(CalledOnValidThread()); 67 DCHECK(CalledOnValidThread());
68 DCHECK(!continue_window_); 68 DCHECK(!continue_window_);
69 69
70 continue_window_ = gtk_dialog_new_with_buttons( 70 continue_window_ = gtk_dialog_new_with_buttons(
71 l10n_util::GetStringUTF8(IDS_PRODUCT_NAME).c_str(), 71 l10n_util::GetStringUTF8(IDS_PRODUCT_NAME).c_str(),
72 NULL, 72 nullptr,
73 static_cast<GtkDialogFlags>(GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR), 73 static_cast<GtkDialogFlags>(GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR),
74 l10n_util::GetStringUTF8(IDS_STOP_SHARING_BUTTON).c_str(), 74 l10n_util::GetStringUTF8(IDS_STOP_SHARING_BUTTON).c_str(),
75 GTK_RESPONSE_CANCEL, 75 GTK_RESPONSE_CANCEL,
76 l10n_util::GetStringUTF8(IDS_CONTINUE_BUTTON).c_str(), 76 l10n_util::GetStringUTF8(IDS_CONTINUE_BUTTON).c_str(),
77 GTK_RESPONSE_OK, 77 GTK_RESPONSE_OK,
78 NULL); 78 nullptr);
79 79
80 gtk_dialog_set_default_response(GTK_DIALOG(continue_window_), 80 gtk_dialog_set_default_response(GTK_DIALOG(continue_window_),
81 GTK_RESPONSE_OK); 81 GTK_RESPONSE_OK);
82 gtk_window_set_resizable(GTK_WINDOW(continue_window_), FALSE); 82 gtk_window_set_resizable(GTK_WINDOW(continue_window_), FALSE);
83 83
84 // Set always-on-top, otherwise this window tends to be obscured by the 84 // Set always-on-top, otherwise this window tends to be obscured by the
85 // DisconnectWindow. 85 // DisconnectWindow.
86 gtk_window_set_keep_above(GTK_WINDOW(continue_window_), TRUE); 86 gtk_window_set_keep_above(GTK_WINDOW(continue_window_), TRUE);
87 87
88 g_signal_connect(continue_window_, "response", 88 g_signal_connect(continue_window_, "response",
(...skipping 23 matching lines...) Expand all
112 112
113 HideUi(); 113 HideUi();
114 } 114 }
115 115
116 // static 116 // static
117 scoped_ptr<HostWindow> HostWindow::CreateContinueWindow() { 117 scoped_ptr<HostWindow> HostWindow::CreateContinueWindow() {
118 return make_scoped_ptr(new ContinueWindowGtk()); 118 return make_scoped_ptr(new ContinueWindowGtk());
119 } 119 }
120 120
121 } // namespace remoting 121 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/config_file_watcher.cc ('k') | remoting/host/continue_window_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698