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

Side by Side Diff: content/shell/browser/shell_login_dialog_gtk.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/shell/browser/shell_login_dialog.h" 5 #include "content/shell/browser/shell_login_dialog.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 28 matching lines...) Expand all
39 gfx::NativeWindow parent_window = 39 gfx::NativeWindow parent_window =
40 web_contents->GetView()->GetTopLevelNativeWindow(); 40 web_contents->GetView()->GetTopLevelNativeWindow();
41 41
42 root_ = gtk_message_dialog_new(parent_window, 42 root_ = gtk_message_dialog_new(parent_window,
43 GTK_DIALOG_MODAL, 43 GTK_DIALOG_MODAL,
44 GTK_MESSAGE_INFO, 44 GTK_MESSAGE_INFO,
45 GTK_BUTTONS_OK_CANCEL, 45 GTK_BUTTONS_OK_CANCEL,
46 "Please log in."); 46 "Please log in.");
47 47
48 GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(root_)); 48 GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(root_));
49 GtkWidget* label = gtk_label_new(UTF16ToUTF8(message).c_str()); 49 GtkWidget* label = gtk_label_new(base::UTF16ToUTF8(message).c_str());
50 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); 50 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
51 gtk_box_pack_start(GTK_BOX(content_area), label, FALSE, FALSE, 0); 51 gtk_box_pack_start(GTK_BOX(content_area), label, FALSE, FALSE, 0);
52 52
53 username_entry_ = gtk_entry_new(); 53 username_entry_ = gtk_entry_new();
54 gtk_entry_set_activates_default(GTK_ENTRY(username_entry_), TRUE); 54 gtk_entry_set_activates_default(GTK_ENTRY(username_entry_), TRUE);
55 55
56 password_entry_ = gtk_entry_new(); 56 password_entry_ = gtk_entry_new();
57 gtk_entry_set_activates_default(GTK_ENTRY(password_entry_), TRUE); 57 gtk_entry_set_activates_default(GTK_ENTRY(password_entry_), TRUE);
58 gtk_entry_set_visibility(GTK_ENTRY(password_entry_), FALSE); 58 gtk_entry_set_visibility(GTK_ENTRY(password_entry_), FALSE);
59 59
(...skipping 27 matching lines...) Expand all
87 } 87 }
88 88
89 void ShellLoginDialog::PlatformRequestCancelled() { 89 void ShellLoginDialog::PlatformRequestCancelled() {
90 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 90 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
91 } 91 }
92 92
93 void ShellLoginDialog::OnResponse(GtkWidget* sender, int response_id) { 93 void ShellLoginDialog::OnResponse(GtkWidget* sender, int response_id) {
94 switch (response_id) { 94 switch (response_id) {
95 case GTK_RESPONSE_OK: 95 case GTK_RESPONSE_OK:
96 UserAcceptedAuth( 96 UserAcceptedAuth(
97 UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(username_entry_))), 97 base::UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(username_entry_))),
98 UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(password_entry_)))); 98 base::UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(password_entry_))));
99 break; 99 break;
100 case GTK_RESPONSE_CANCEL: 100 case GTK_RESPONSE_CANCEL:
101 case GTK_RESPONSE_DELETE_EVENT: 101 case GTK_RESPONSE_DELETE_EVENT:
102 UserCancelledAuth(); 102 UserCancelledAuth();
103 break; 103 break;
104 default: 104 default:
105 NOTREACHED(); 105 NOTREACHED();
106 } 106 }
107 107
108 gtk_widget_destroy(root_); 108 gtk_widget_destroy(root_);
109 } 109 }
110 110
111 } // namespace content 111 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_login_dialog.cc ('k') | content/shell/browser/shell_plugin_service_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698