| OLD | NEW |
| 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 "chrome/browser/ui/login/login_prompt.h" | 5 #include "chrome/browser/ui/login/login_prompt.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/browser_thread.h" | 10 #include "chrome/browser/browser_thread.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 gtk_entry_set_text(GTK_ENTRY(username_entry_), | 57 gtk_entry_set_text(GTK_ENTRY(username_entry_), |
| 58 WideToUTF8(username).c_str()); | 58 WideToUTF8(username).c_str()); |
| 59 gtk_entry_set_text(GTK_ENTRY(password_entry_), | 59 gtk_entry_set_text(GTK_ENTRY(password_entry_), |
| 60 WideToUTF8(password).c_str()); | 60 WideToUTF8(password).c_str()); |
| 61 gtk_editable_select_region(GTK_EDITABLE(username_entry_), 0, -1); | 61 gtk_editable_select_region(GTK_EDITABLE(username_entry_), 0, -1); |
| 62 } | 62 } |
| 63 } | 63 } |
| 64 | 64 |
| 65 // LoginHandler: | 65 // LoginHandler: |
| 66 virtual void BuildViewForPasswordManager(PasswordManager* manager, | 66 virtual void BuildViewForPasswordManager(PasswordManager* manager, |
| 67 std::wstring explanation) { | 67 const string16& explanation) { |
| 68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 69 | 69 |
| 70 root_.Own(gtk_vbox_new(FALSE, gtk_util::kContentAreaBorder)); | 70 root_.Own(gtk_vbox_new(FALSE, gtk_util::kContentAreaBorder)); |
| 71 GtkWidget* label = gtk_label_new(WideToUTF8(explanation).c_str()); | 71 GtkWidget* label = gtk_label_new(UTF16ToUTF8(explanation).c_str()); |
| 72 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); | 72 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); |
| 73 gtk_box_pack_start(GTK_BOX(root_.get()), label, FALSE, FALSE, 0); | 73 gtk_box_pack_start(GTK_BOX(root_.get()), label, FALSE, FALSE, 0); |
| 74 | 74 |
| 75 username_entry_ = gtk_entry_new(); | 75 username_entry_ = gtk_entry_new(); |
| 76 gtk_entry_set_activates_default(GTK_ENTRY(username_entry_), TRUE); | 76 gtk_entry_set_activates_default(GTK_ENTRY(username_entry_), TRUE); |
| 77 | 77 |
| 78 password_entry_ = gtk_entry_new(); | 78 password_entry_ = gtk_entry_new(); |
| 79 gtk_entry_set_activates_default(GTK_ENTRY(password_entry_), TRUE); | 79 gtk_entry_set_activates_default(GTK_ENTRY(password_entry_), TRUE); |
| 80 gtk_entry_set_visibility(GTK_ENTRY(password_entry_), FALSE); | 80 gtk_entry_set_visibility(GTK_ENTRY(password_entry_), FALSE); |
| 81 | 81 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // GtkEntry widgets that the user types into. | 146 // GtkEntry widgets that the user types into. |
| 147 GtkWidget* username_entry_; | 147 GtkWidget* username_entry_; |
| 148 GtkWidget* password_entry_; | 148 GtkWidget* password_entry_; |
| 149 GtkWidget* ok_; | 149 GtkWidget* ok_; |
| 150 | 150 |
| 151 DISALLOW_COPY_AND_ASSIGN(LoginHandlerGtk); | 151 DISALLOW_COPY_AND_ASSIGN(LoginHandlerGtk); |
| 152 }; | 152 }; |
| 153 | 153 |
| 154 void LoginHandlerGtk::OnOKClicked(GtkWidget* sender) { | 154 void LoginHandlerGtk::OnOKClicked(GtkWidget* sender) { |
| 155 SetAuth( | 155 SetAuth( |
| 156 UTF8ToWide(gtk_entry_get_text(GTK_ENTRY(username_entry_))), | 156 UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(username_entry_))), |
| 157 UTF8ToWide(gtk_entry_get_text(GTK_ENTRY(password_entry_)))); | 157 UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(password_entry_)))); |
| 158 } | 158 } |
| 159 | 159 |
| 160 void LoginHandlerGtk::OnCancelClicked(GtkWidget* sender) { | 160 void LoginHandlerGtk::OnCancelClicked(GtkWidget* sender) { |
| 161 CancelAuth(); | 161 CancelAuth(); |
| 162 } | 162 } |
| 163 | 163 |
| 164 void LoginHandlerGtk::OnPromptHierarchyChanged(GtkWidget* sender, | 164 void LoginHandlerGtk::OnPromptHierarchyChanged(GtkWidget* sender, |
| 165 GtkWidget* previous_toplevel) { | 165 GtkWidget* previous_toplevel) { |
| 166 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 166 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 167 | 167 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 189 SetFocusedWidget(username_entry_); | 189 SetFocusedWidget(username_entry_); |
| 190 #endif | 190 #endif |
| 191 } | 191 } |
| 192 } | 192 } |
| 193 | 193 |
| 194 // static | 194 // static |
| 195 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info, | 195 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info, |
| 196 net::URLRequest* request) { | 196 net::URLRequest* request) { |
| 197 return new LoginHandlerGtk(auth_info, request); | 197 return new LoginHandlerGtk(auth_info, request); |
| 198 } | 198 } |
| OLD | NEW |