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

Side by Side Diff: chrome/browser/ui/views/crypto_module_password_dialog_view.cc

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
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 "chrome/browser/ui/views/crypto_module_password_dialog_view.h" 5 #include "chrome/browser/ui/views/crypto_module_password_dialog_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "grit/generated_resources.h" 8 #include "grit/generated_resources.h"
9 #include "ui/base/event.h"
9 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/views/controls/button/text_button.h" 11 #include "ui/views/controls/button/text_button.h"
11 #include "ui/views/controls/label.h" 12 #include "ui/views/controls/label.h"
12 #include "ui/views/controls/textfield/textfield.h" 13 #include "ui/views/controls/textfield/textfield.h"
13 #include "ui/views/layout/grid_layout.h" 14 #include "ui/views/layout/grid_layout.h"
14 #include "ui/views/layout/layout_constants.h" 15 #include "ui/views/layout/layout_constants.h"
15 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
16 17
17 namespace browser { 18 namespace browser {
18 19
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 return true; 71 return true;
71 } 72 }
72 73
73 void CryptoModulePasswordDialogView::ContentsChanged( 74 void CryptoModulePasswordDialogView::ContentsChanged(
74 views::Textfield* sender, 75 views::Textfield* sender,
75 const string16& new_contents) { 76 const string16& new_contents) {
76 } 77 }
77 78
78 bool CryptoModulePasswordDialogView::HandleKeyEvent( 79 bool CryptoModulePasswordDialogView::HandleKeyEvent(
79 views::Textfield* sender, 80 views::Textfield* sender,
80 const views::KeyEvent& keystroke) { 81 const ui::KeyEvent& keystroke) {
81 return false; 82 return false;
82 } 83 }
83 84
84 void CryptoModulePasswordDialogView::Init(const std::string& server, 85 void CryptoModulePasswordDialogView::Init(const std::string& server,
85 const std::string& slot_name, 86 const std::string& slot_name,
86 CryptoModulePasswordReason reason) { 87 CryptoModulePasswordReason reason) {
87 // Select an appropriate text for the reason. 88 // Select an appropriate text for the reason.
88 std::string text; 89 std::string text;
89 const string16& server16 = UTF8ToUTF16(server); 90 const string16& server16 = UTF8ToUTF16(server);
90 const string16& slot16 = UTF8ToUTF16(slot_name); 91 const string16& slot16 = UTF8ToUTF16(slot_name);
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 bool retry, 157 bool retry,
157 CryptoModulePasswordReason reason, 158 CryptoModulePasswordReason reason,
158 const std::string& server, 159 const std::string& server,
159 const CryptoModulePasswordCallback& callback) { 160 const CryptoModulePasswordCallback& callback) {
160 CryptoModulePasswordDialogView* dialog = 161 CryptoModulePasswordDialogView* dialog =
161 new CryptoModulePasswordDialogView(slot_name, reason, server, callback); 162 new CryptoModulePasswordDialogView(slot_name, reason, server, callback);
162 views::Widget::CreateWindow(dialog)->Show(); 163 views::Widget::CreateWindow(dialog)->Show();
163 } 164 }
164 165
165 } // namespace browser 166 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/crypto_module_password_dialog_view.h ('k') | chrome/browser/ui/views/download/download_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698