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/chromeos/options/wifi_config_view.h" | 5 #include "chrome/browser/chromeos/options/wifi_config_view.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/chromeos/cros/cros_library.h" | 9 #include "chrome/browser/chromeos/cros/cros_library.h" |
10 #include "chrome/browser/chromeos/login/user_manager.h" | 10 #include "chrome/browser/chromeos/login/user_manager.h" |
11 #include "chrome/browser/chromeos/options/network_config_view.h" | 11 #include "chrome/browser/chromeos/options/network_config_view.h" |
12 #include "grit/chromium_strings.h" | 12 #include "grit/chromium_strings.h" |
13 #include "grit/generated_resources.h" | 13 #include "grit/generated_resources.h" |
14 #include "grit/locale_settings.h" | 14 #include "grit/locale_settings.h" |
15 #include "grit/theme_resources.h" | 15 #include "grit/theme_resources.h" |
16 #include "ui/base/l10n/l10n_util.h" | 16 #include "ui/base/l10n/l10n_util.h" |
17 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
18 #include "views/controls/button/image_button.h" | 18 #include "views/controls/button/image_button.h" |
19 #include "views/controls/button/native_button.h" | 19 #include "views/controls/button/native_button.h" |
20 #include "views/controls/label.h" | 20 #include "views/controls/label.h" |
| 21 #include "views/controls/textfield/textfield.h" |
21 #include "views/layout/grid_layout.h" | 22 #include "views/layout/grid_layout.h" |
22 #include "views/layout/layout_constants.h" | 23 #include "views/layout/layout_constants.h" |
23 #include "views/window/window.h" | 24 #include "views/window/window.h" |
24 | 25 |
25 namespace chromeos { | 26 namespace chromeos { |
26 | 27 |
27 namespace { | 28 namespace { |
28 | 29 |
29 // The width of the password field. | 30 // The width of the password field. |
30 const int kPasswordWidth = 150; | 31 const int kPasswordWidth = 150; |
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
585 error_label_ = new views::Label(); | 586 error_label_ = new views::Label(); |
586 error_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 587 error_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
587 error_label_->SetColor(SK_ColorRED); | 588 error_label_->SetColor(SK_ColorRED); |
588 layout->AddView(error_label_); | 589 layout->AddView(error_label_); |
589 | 590 |
590 // Set or hide the error text. | 591 // Set or hide the error text. |
591 UpdateErrorLabel(false); | 592 UpdateErrorLabel(false); |
592 } | 593 } |
593 | 594 |
594 } // namespace chromeos | 595 } // namespace chromeos |
OLD | NEW |