Simplify LoginState methods.

chrome/browser/chromeos/options/wifi_config_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
 
 #include "ash/system/chromeos/network/network_connect.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 557 matching lines @@
     share_network_checkbox_->SetChecked(value);
     share_network_checkbox_->SetEnabled(enabled);
   }
 }
 
 void WifiConfigView::UpdateErrorLabel() {
   base::string16 error_msg;
   if (UserCertRequired() && CertLibrary::Get()->CertificatesLoaded()) {
     if (!HaveUserCerts()) {
       if (!LoginState::Get()->IsUserLoggedIn() ||
-          LoginState::Get()->IsGuestUser()) {
+          LoginState::Get()->IsGuestSessionUser()) {

[stevenjb, 2014/08/08 16:57:06]

Do installed certificates in public sessions persist? I guess if it is a public
session then 'login' isn't an option anyway? Maybe we should add a comment to
that effect.

[pneubeck (no reviews), 2014/08/08 20:45:24]

Yes, right. I don't want to change behavior in this CL so I added the public
session to this condition.

In the follow up, I will remove public session from this condition as the TPM is
loaded and policy can install certs. I think it would be irritating to tell the
user to login in. The other message seems to be more helpful.

[stevenjb, 2014/08/12 02:23:17]

sgtm

         error_msg = l10n_util::GetStringUTF16(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN_FOR_USER_CERT);
       } else {
         error_msg = l10n_util::GetStringUTF16(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PLEASE_INSTALL_USER_CERT);
       }
     } else if (!IsUserCertValid()) {
       error_msg = l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_REQUIRE_HARDWARE_BACKED);
     }
@@ skipping 785 matching lines @@
 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
                                         const NetworkState* network,
                                         const std::string& key) {
   std::string onc_tag = network->type() == shill::kTypeEthernet
                             ? ::onc::ethernet::kEAP
                             : ::onc::wifi::kEAP;
   ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);
 }
 
 }  // namespace chromeos