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

Side by Side Diff: chrome/browser/chromeos/options/wifi_config_view.cc

Issue 8607001: views: Factor out Listener from Combobox into its own header file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sky review Created 9 years, 1 month 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) 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/cros/network_library.h" 10 #include "chrome/browser/chromeos/cros/network_library.h"
11 #include "chrome/browser/chromeos/login/user_manager.h" 11 #include "chrome/browser/chromeos/login/user_manager.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 "ui/views/layout/grid_layout.h" 18 #include "ui/views/layout/grid_layout.h"
19 #include "ui/views/layout/layout_constants.h" 19 #include "ui/views/layout/layout_constants.h"
20 #include "views/controls/button/checkbox.h" 20 #include "views/controls/button/checkbox.h"
21 #include "views/controls/button/image_button.h" 21 #include "views/controls/button/image_button.h"
22 #include "views/controls/combobox/combobox.h"
22 #include "views/controls/label.h" 23 #include "views/controls/label.h"
23 #include "views/controls/textfield/textfield.h" 24 #include "views/controls/textfield/textfield.h"
24 25
25 namespace chromeos { 26 namespace chromeos {
26 27
27 namespace { 28 namespace {
28 29
29 // Returns true if network is known to require 802.1x. 30 // Returns true if network is known to require 802.1x.
30 bool Is8021x(const WifiNetwork* wifi) { 31 bool Is8021x(const WifiNetwork* wifi) {
31 return wifi && wifi->encrypted() && wifi->encryption() == SECURITY_8021X; 32 return wifi && wifi->encrypted() && wifi->encryption() == SECURITY_8021X;
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 // Set focus to a reasonable widget, depending on what we're showing. 1074 // Set focus to a reasonable widget, depending on what we're showing.
1074 if (ssid_textfield_) 1075 if (ssid_textfield_)
1075 ssid_textfield_->RequestFocus(); 1076 ssid_textfield_->RequestFocus();
1076 else if (eap_method_combobox_) 1077 else if (eap_method_combobox_)
1077 eap_method_combobox_->RequestFocus(); 1078 eap_method_combobox_->RequestFocus();
1078 else if (passphrase_textfield_ && passphrase_textfield_->IsEnabled()) 1079 else if (passphrase_textfield_ && passphrase_textfield_->IsEnabled())
1079 passphrase_textfield_->RequestFocus(); 1080 passphrase_textfield_->RequestFocus();
1080 } 1081 }
1081 1082
1082 } // namespace chromeos 1083 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698