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

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

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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/strings/utf_string_conversions.h"
8 #include "grit/generated_resources.h" 8 #include "grit/generated_resources.h"
9 #include "ui/base/events/event.h" 9 #include "ui/base/events/event.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
11 #include "ui/views/controls/button/text_button.h" 11 #include "ui/views/controls/button/text_button.h"
12 #include "ui/views/controls/label.h" 12 #include "ui/views/controls/label.h"
13 #include "ui/views/controls/textfield/textfield.h" 13 #include "ui/views/controls/textfield/textfield.h"
14 #include "ui/views/layout/grid_layout.h" 14 #include "ui/views/layout/grid_layout.h"
15 #include "ui/views/layout/layout_constants.h" 15 #include "ui/views/layout/layout_constants.h"
16 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
17 17
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 bool retry, 153 bool retry,
154 CryptoModulePasswordReason reason, 154 CryptoModulePasswordReason reason,
155 const std::string& server, 155 const std::string& server,
156 const CryptoModulePasswordCallback& callback) { 156 const CryptoModulePasswordCallback& callback) {
157 CryptoModulePasswordDialogView* dialog = 157 CryptoModulePasswordDialogView* dialog =
158 new CryptoModulePasswordDialogView(slot_name, reason, server, callback); 158 new CryptoModulePasswordDialogView(slot_name, reason, server, callback);
159 views::DialogDelegate::CreateDialogWidget(dialog, NULL, NULL)->Show(); 159 views::DialogDelegate::CreateDialogWidget(dialog, NULL, NULL)->Show();
160 } 160 }
161 161
162 } // namespace chrome 162 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698