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

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

Issue 141523005: Combobox: Rename styles to STYLE_NORMAL and STYLE_ACTION and modify behaviors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bug fix for Windows Created 6 years, 10 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
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/bind.h" 8 #include "base/bind.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 passphrase_visible_button_->SetToggled(false); 618 passphrase_visible_button_->SetToggled(false);
619 } else { 619 } else {
620 passphrase_textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_TEXT); 620 passphrase_textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_TEXT);
621 passphrase_visible_button_->SetToggled(true); 621 passphrase_visible_button_->SetToggled(true);
622 } 622 }
623 } else { 623 } else {
624 NOTREACHED(); 624 NOTREACHED();
625 } 625 }
626 } 626 }
627 627
628 void WifiConfigView::OnSelectedIndexChanged(views::Combobox* combobox) { 628 void WifiConfigView::OnPerformAction(views::Combobox* combobox) {
629 if (combobox == security_combobox_) { 629 if (combobox == security_combobox_) {
630 bool passphrase_enabled = PassphraseActive(); 630 bool passphrase_enabled = PassphraseActive();
631 passphrase_label_->SetEnabled(passphrase_enabled); 631 passphrase_label_->SetEnabled(passphrase_enabled);
632 passphrase_textfield_->SetEnabled(passphrase_enabled && 632 passphrase_textfield_->SetEnabled(passphrase_enabled &&
633 passphrase_ui_data_.IsEditable()); 633 passphrase_ui_data_.IsEditable());
634 if (!passphrase_enabled) 634 if (!passphrase_enabled)
635 passphrase_textfield_->SetText(base::string16()); 635 passphrase_textfield_->SetText(base::string16());
636 RefreshShareCheckbox(); 636 RefreshShareCheckbox();
637 } else if (combobox == user_cert_combobox_) { 637 } else if (combobox == user_cert_combobox_) {
638 RefreshShareCheckbox(); 638 RefreshShareCheckbox();
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
1348 void WifiConfigView::ParseWiFiEAPUIProperty( 1348 void WifiConfigView::ParseWiFiEAPUIProperty(
1349 NetworkPropertyUIData* property_ui_data, 1349 NetworkPropertyUIData* property_ui_data,
1350 const NetworkState* network, 1350 const NetworkState* network,
1351 const std::string& key) { 1351 const std::string& key) {
1352 ParseWiFiUIProperty( 1352 ParseWiFiUIProperty(
1353 property_ui_data, network, 1353 property_ui_data, network,
1354 base::StringPrintf("%s.%s", ::onc::wifi::kEAP, key.c_str())); 1354 base::StringPrintf("%s.%s", ::onc::wifi::kEAP, key.c_str()));
1355 } 1355 }
1356 1356
1357 } // namespace chromeos 1357 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.h ('k') | chrome/browser/ui/views/autofill/autofill_dialog_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698