kiosk: Fix network check skipped regression.

chrome/browser/chromeos/app_mode/startup_app_launcher.cc

 // Copyright 2013 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/app_mode/startup_app_launcher.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
 #include "extensions/common/manifest_handlers/offline_enabled_info.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
@@ skipping 96 matching lines @@
   }
 
   // If we are restarting chrome (i.e. on crash), we need to initialize
   // OAuth2TokenService as well.
   InitializeTokenService();
 }
 
 void StartupAppLauncher::MaybeInitializeNetwork() {
   const Extension* extension = extensions::ExtensionSystem::Get(profile_)->
       extension_service()->GetInstalledExtension(app_id_);
+  // Kiosk apps are platform apps and platform apps default to be
+  // offline enabled if "offline_enabled" key is not provided. However,
+  // network check should be performed in that case. The only case the check
+  // should be skipped is the kiosk app explicitly declares "offline_enabled"
+  // true in its manifest.

[miket_OOO, 2014/03/05 18:32:22]

Is this a good idea? It's giving a lot of subtlety to the offline_enabled key.
Would something more explicit like a new and separate "requires_network_check"
key be less surprising?

[xiyuan, 2014/03/05 18:44:18]

Agree that having a new key would be more straightforward. But think we still
needs this CL to fix M34 out there for not breaking the existing behavior.

   const bool requires_network = !extension ||
+      !extension->manifest()->HasKey(
+          extensions::manifest_keys::kOfflineEnabled) ||
       !extensions::OfflineEnabledInfo::IsOfflineEnabled(extension);
 
   if (requires_network) {
     delegate_->InitializeNetwork();
     return;
   }
 
   // Offline enabled app attempts update if network is ready. Otherwise,
   // go directly to launch.
   if (delegate_->IsNetworkReady())
@@ skipping 147 matching lines @@
   ready_to_launch_ = true;
   delegate_->OnReadyToLaunch();
 }
 
 void StartupAppLauncher::UpdateAppData() {
   KioskAppManager::Get()->ClearAppData(app_id_);
   KioskAppManager::Get()->UpdateAppDataFromProfile(app_id_, profile_, NULL);
 }
 
 }   // namespace chromeos