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

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

Issue 450363002: Simplify LoginState methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Check that retail mode is not used. Created 6 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/settings/system_settings_provider.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 "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 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 share_network_checkbox_->SetChecked(value); 568 share_network_checkbox_->SetChecked(value);
569 share_network_checkbox_->SetEnabled(enabled); 569 share_network_checkbox_->SetEnabled(enabled);
570 } 570 }
571 } 571 }
572 572
573 void WifiConfigView::UpdateErrorLabel() { 573 void WifiConfigView::UpdateErrorLabel() {
574 base::string16 error_msg; 574 base::string16 error_msg;
575 if (UserCertRequired() && CertLibrary::Get()->CertificatesLoaded()) { 575 if (UserCertRequired() && CertLibrary::Get()->CertificatesLoaded()) {
576 if (!HaveUserCerts()) { 576 if (!HaveUserCerts()) {
577 if (!LoginState::Get()->IsUserLoggedIn() || 577 if (!LoginState::Get()->IsUserLoggedIn() ||
578 LoginState::Get()->IsGuestUser()) { 578 LoginState::Get()->IsGuestSessionUser() ||
579 LoginState::Get()->IsPublicSessionUser()) {
579 error_msg = l10n_util::GetStringUTF16( 580 error_msg = l10n_util::GetStringUTF16(
580 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN_FOR_USER_CERT); 581 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN_FOR_USER_CERT);
581 } else { 582 } else {
582 error_msg = l10n_util::GetStringUTF16( 583 error_msg = l10n_util::GetStringUTF16(
583 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PLEASE_INSTALL_USER_CERT); 584 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PLEASE_INSTALL_USER_CERT);
584 } 585 }
585 } else if (!IsUserCertValid()) { 586 } else if (!IsUserCertValid()) {
586 error_msg = l10n_util::GetStringUTF16( 587 error_msg = l10n_util::GetStringUTF16(
587 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_REQUIRE_HARDWARE_BACKED); 588 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_REQUIRE_HARDWARE_BACKED);
588 } 589 }
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data, 1375 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
1375 const NetworkState* network, 1376 const NetworkState* network,
1376 const std::string& key) { 1377 const std::string& key) {
1377 std::string onc_tag = network->type() == shill::kTypeEthernet 1378 std::string onc_tag = network->type() == shill::kTypeEthernet
1378 ? ::onc::ethernet::kEAP 1379 ? ::onc::ethernet::kEAP
1379 : ::onc::wifi::kEAP; 1380 : ::onc::wifi::kEAP;
1380 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key); 1381 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);
1381 } 1382 }
1382 1383
1383 } // namespace chromeos 1384 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/settings/system_settings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698