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

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

Issue 9355059: Renaming virtual setters/getters in UserManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: year Created 8 years, 9 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 | 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 "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 security_combobox_->selected_item() == SECURITY_INDEX_NONE) { 456 security_combobox_->selected_item() == SECURITY_INDEX_NONE) {
457 share_network_checkbox_->SetEnabled(false); 457 share_network_checkbox_->SetEnabled(false);
458 share_network_checkbox_->SetChecked(true); 458 share_network_checkbox_->SetChecked(true);
459 } else if (eap_method_combobox_ && 459 } else if (eap_method_combobox_ &&
460 (eap_method_combobox_->selected_item() == EAP_METHOD_INDEX_TLS || 460 (eap_method_combobox_->selected_item() == EAP_METHOD_INDEX_TLS ||
461 user_cert_combobox_->selected_item() != 0)) { 461 user_cert_combobox_->selected_item() != 0)) {
462 // Can not share TLS network (requires certificate), or any network where 462 // Can not share TLS network (requires certificate), or any network where
463 // user certificates are enabled. 463 // user certificates are enabled.
464 share_network_checkbox_->SetEnabled(false); 464 share_network_checkbox_->SetEnabled(false);
465 share_network_checkbox_->SetChecked(false); 465 share_network_checkbox_->SetChecked(false);
466 } else if (!UserManager::Get()->user_is_logged_in()) { 466 } else if (!UserManager::Get()->IsUserLoggedIn()) {
467 // If not logged in, networks must be shared. 467 // If not logged in, networks must be shared.
468 share_network_checkbox_->SetEnabled(false); 468 share_network_checkbox_->SetEnabled(false);
469 share_network_checkbox_->SetChecked(true); 469 share_network_checkbox_->SetChecked(true);
470 } else { 470 } else {
471 share_network_checkbox_->SetEnabled(true); 471 share_network_checkbox_->SetEnabled(true);
472 share_network_checkbox_->SetChecked(false); // Default to unshared. 472 share_network_checkbox_->SetChecked(false); // Default to unshared.
473 } 473 }
474 } 474 }
475 475
476 void WifiConfigView::UpdateErrorLabel() { 476 void WifiConfigView::UpdateErrorLabel() {
477 std::string error_msg; 477 std::string error_msg;
478 if (UserCertRequired() && cert_library_->CertificatesLoaded()) { 478 if (UserCertRequired() && cert_library_->CertificatesLoaded()) {
479 if (!HaveUserCerts()) { 479 if (!HaveUserCerts()) {
480 if (!UserManager::Get()->user_is_logged_in()) { 480 if (!UserManager::Get()->IsUserLoggedIn()) {
481 error_msg = l10n_util::GetStringUTF8( 481 error_msg = l10n_util::GetStringUTF8(
482 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN_FOR_USER_CERT); 482 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN_FOR_USER_CERT);
483 } else { 483 } else {
484 error_msg = l10n_util::GetStringUTF8( 484 error_msg = l10n_util::GetStringUTF8(
485 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PLEASE_INSTALL_USER_CERT); 485 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PLEASE_INSTALL_USER_CERT);
486 } 486 }
487 } else if (!IsUserCertValid()) { 487 } else if (!IsUserCertValid()) {
488 error_msg = l10n_util::GetStringUTF8( 488 error_msg = l10n_util::GetStringUTF8(
489 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_REQUIRE_HARDWARE_BACKED); 489 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_REQUIRE_HARDWARE_BACKED);
490 } 490 }
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
1162 void WifiConfigView::ParseWiFiEAPUIProperty( 1162 void WifiConfigView::ParseWiFiEAPUIProperty(
1163 NetworkPropertyUIData* property_ui_data, 1163 NetworkPropertyUIData* property_ui_data,
1164 Network* network, 1164 Network* network,
1165 const std::string& key) { 1165 const std::string& key) {
1166 ParseWiFiUIProperty( 1166 ParseWiFiUIProperty(
1167 property_ui_data, network, 1167 property_ui_data, network,
1168 base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str())); 1168 base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str()));
1169 } 1169 }
1170 1170
1171 } // namespace chromeos 1171 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/webui_screen_locker.cc ('k') | chrome/browser/chromeos/power/power_button_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698