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

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

Issue 108063004: Give up focus if the focused view becomes unfocusable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Extracted to common code into FocusManager class Created 7 years 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/chromeos/options/wifi_config_view.h" 5 #include "chrome/browser/chromeos/options/wifi_config_view.h"
6 6
7 #include "ash/system/chromeos/network/network_connect.h" 7 #include "ash/system/chromeos/network/network_connect.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 passphrase_label_->SetEnabled(wifi); 1074 passphrase_label_->SetEnabled(wifi);
1075 passphrase_textfield_->SetEnabled(wifi && passphrase_ui_data_.IsEditable()); 1075 passphrase_textfield_->SetEnabled(wifi && passphrase_ui_data_.IsEditable());
1076 passphrase_textfield_->SetAccessibleName(passphrase_label_text); 1076 passphrase_textfield_->SetAccessibleName(passphrase_label_text);
1077 layout->AddView(passphrase_textfield_); 1077 layout->AddView(passphrase_textfield_);
1078 1078
1079 if (passphrase_ui_data_.IsManaged()) { 1079 if (passphrase_ui_data_.IsManaged()) {
1080 layout->AddView(new ControlledSettingIndicatorView(passphrase_ui_data_)); 1080 layout->AddView(new ControlledSettingIndicatorView(passphrase_ui_data_));
1081 } else { 1081 } else {
1082 // Password visible button. 1082 // Password visible button.
1083 passphrase_visible_button_ = new views::ToggleImageButton(this); 1083 passphrase_visible_button_ = new views::ToggleImageButton(this);
1084 passphrase_visible_button_->set_focusable(true); 1084 passphrase_visible_button_->SetFocusable(true);
1085 passphrase_visible_button_->SetTooltipText( 1085 passphrase_visible_button_->SetTooltipText(
1086 l10n_util::GetStringUTF16( 1086 l10n_util::GetStringUTF16(
1087 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_SHOW)); 1087 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_SHOW));
1088 passphrase_visible_button_->SetToggledTooltipText( 1088 passphrase_visible_button_->SetToggledTooltipText(
1089 l10n_util::GetStringUTF16( 1089 l10n_util::GetStringUTF16(
1090 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_HIDE)); 1090 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_HIDE));
1091 passphrase_visible_button_->SetImage( 1091 passphrase_visible_button_->SetImage(
1092 views::ImageButton::STATE_NORMAL, 1092 views::ImageButton::STATE_NORMAL,
1093 ResourceBundle::GetSharedInstance(). 1093 ResourceBundle::GetSharedInstance().
1094 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD)); 1094 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD));
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 void WifiConfigView::ParseWiFiEAPUIProperty( 1343 void WifiConfigView::ParseWiFiEAPUIProperty(
1344 NetworkPropertyUIData* property_ui_data, 1344 NetworkPropertyUIData* property_ui_data,
1345 const NetworkState* network, 1345 const NetworkState* network,
1346 const std::string& key) { 1346 const std::string& key) {
1347 ParseWiFiUIProperty( 1347 ParseWiFiUIProperty(
1348 property_ui_data, network, 1348 property_ui_data, network,
1349 base::StringPrintf("%s.%s", ::onc::wifi::kEAP, key.c_str())); 1349 base::StringPrintf("%s.%s", ::onc::wifi::kEAP, key.c_str()));
1350 } 1350 }
1351 1351
1352 } // namespace chromeos 1352 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698