Merge 139683 - Disable showing GSC when in KioskMode.

chrome/browser/chromeos/login/existing_user_controller.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/login/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 693 matching lines @@
   return host_->GetNativeWindow();
 }
 
 void ExistingUserController::InitializeStartUrls() const {
   std::vector<std::string> start_urls;
   // Guide URL is not added to start URLs as it should be passed as an app.
   std::string guide_url;
 
   PrefService* prefs = g_browser_process->local_state();
   const base::ListValue *urls;
-  if (UserManager::Get()->IsLoggedInAsDemoUser() &&
-      CrosSettings::Get()->GetList(kStartUpUrls, &urls)) {
-    // the demo user will get its start urls from the special policy if it is
-    // set.
-    for (base::ListValue::const_iterator it = urls->begin();
-         it != urls->end(); ++it) {
-      std::string url;
-      if ((*it)->GetAsString(&url))
-        start_urls.push_back(url);
+  if (UserManager::Get()->IsLoggedInAsDemoUser()) {
+    if (CrosSettings::Get()->GetList(kStartUpUrls, &urls)) {
+      // the demo user will get its start urls from the special policy if it is
+      // set.
+      for (base::ListValue::const_iterator it = urls->begin();
+           it != urls->end(); ++it) {
+        std::string url;
+        if ((*it)->GetAsString(&url))
+          start_urls.push_back(url);
+      }
     }
   } else {
     if (prefs->GetBoolean(prefs::kSpokenFeedbackEnabled)) {
       const char* url = kChromeVoxTutorialURLPattern;
       const std::string current_locale =
           StringToLowerASCII(prefs->GetString(prefs::kApplicationLocale));
       std::string vox_url = base::StringPrintf(url, current_locale.c_str());
       start_urls.push_back(vox_url);
     } else {
       guide_url = GetGettingStartedGuideURL();
@@ skipping 132 matching lines @@
   // Invalidate OAuth token, since it can't be correct after password is
   // changed.
   UserManager::Get()->SaveUserOAuthStatus(username,
                                           User::OAUTH_TOKEN_STATUS_INVALID);
 
   login_display_->SetUIEnabled(true);
   login_display_->ShowGaiaPasswordChanged(username);
 }
 
 }  // namespace chromeos