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

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

Issue 1963563002: Views: Flip default value of CustomButton::request_focus_on_press_ to false. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 7 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
« no previous file with comments | « ash/system/user/user_view.cc ('k') | chrome/browser/chromeos/options/wimax_config_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 passphrase_ui_data_.IsEditable()); 1103 passphrase_ui_data_.IsEditable());
1104 passphrase_textfield_->SetAccessibleName(passphrase_label_text); 1104 passphrase_textfield_->SetAccessibleName(passphrase_label_text);
1105 layout->AddView(passphrase_textfield_); 1105 layout->AddView(passphrase_textfield_);
1106 1106
1107 if (passphrase_ui_data_.IsManaged()) { 1107 if (passphrase_ui_data_.IsManaged()) {
1108 layout->AddView(new ControlledSettingIndicatorView(passphrase_ui_data_)); 1108 layout->AddView(new ControlledSettingIndicatorView(passphrase_ui_data_));
1109 } else { 1109 } else {
1110 // Password visible button. 1110 // Password visible button.
1111 passphrase_visible_button_ = new views::ToggleImageButton(this); 1111 passphrase_visible_button_ = new views::ToggleImageButton(this);
1112 views::Button::ConfigureDefaultFocus(passphrase_visible_button_); 1112 views::Button::ConfigureDefaultFocus(passphrase_visible_button_);
1113 passphrase_visible_button_->set_request_focus_on_press(true);
1113 passphrase_visible_button_->SetTooltipText( 1114 passphrase_visible_button_->SetTooltipText(
1114 l10n_util::GetStringUTF16( 1115 l10n_util::GetStringUTF16(
1115 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_SHOW)); 1116 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_SHOW));
1116 passphrase_visible_button_->SetToggledTooltipText( 1117 passphrase_visible_button_->SetToggledTooltipText(
1117 l10n_util::GetStringUTF16( 1118 l10n_util::GetStringUTF16(
1118 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_HIDE)); 1119 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_HIDE));
1119 passphrase_visible_button_->SetImage( 1120 passphrase_visible_button_->SetImage(
1120 views::ImageButton::STATE_NORMAL, 1121 views::ImageButton::STATE_NORMAL,
1121 ResourceBundle::GetSharedInstance(). 1122 ResourceBundle::GetSharedInstance().
1122 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD)); 1123 GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD));
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
1383 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data, 1384 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
1384 const NetworkState* network, 1385 const NetworkState* network,
1385 const std::string& key) { 1386 const std::string& key) {
1386 std::string onc_tag = network->type() == shill::kTypeEthernet 1387 std::string onc_tag = network->type() == shill::kTypeEthernet
1387 ? ::onc::ethernet::kEAP 1388 ? ::onc::ethernet::kEAP
1388 : ::onc::wifi::kEAP; 1389 : ::onc::wifi::kEAP;
1389 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key); 1390 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);
1390 } 1391 }
1391 1392
1392 } // namespace chromeos 1393 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/system/user/user_view.cc ('k') | chrome/browser/chromeos/options/wimax_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698