kiosk: Skip network check for offline enabled app.

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 16 matching lines @@
 #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_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"
 
 using content::BrowserThread;
@@ skipping 80 matching lines @@
       Version browser_min_version(update.browser_min_version);
       if (browser_version.IsValid() &&
           browser_min_version.IsValid() &&
           browser_min_version.CompareTo(browser_version) > 0) {
         launcher_->OnUpdateCheckNoUpdate();
         return;
       }
     }
 
     const Version& existing_version = *GetInstalledApp()->version();
-    Version update_version(update.version);
-    if (existing_version.IsValid() &&
-        update_version.IsValid() &&
-        update_version.CompareTo(existing_version) <= 0) {
+    const Version update_version(update.version);
+    if (!update_version.IsValid() ||
+        (existing_version.IsValid() &&
+         update_version.CompareTo(existing_version) <= 0)) {
       launcher_->OnUpdateCheckNoUpdate();
       return;
     }
 
     launcher_->OnUpdateCheckUpdateAvailable();
   }
 
   // net::URLFetcherDelegate implementation.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE {
     DCHECK_EQ(source, manifest_fetcher_.get());
@@ skipping 103 matching lines @@
     UserManager::Get()->SetAppModeChromeClientOAuthInfo(
             auth_params_.client_id,
             auth_params_.client_secret);
   }
 
   // If we are restarting chrome (i.e. on crash), we need to initialize
   // OAuth2TokenService as well.
   InitializeTokenService();
 }
 
-void StartupAppLauncher::InitializeNetwork() {
-  delegate_->InitializeNetwork();
+void StartupAppLauncher::MaybeInitializeNetwork() {
+  const Extension* extension = extensions::ExtensionSystem::Get(profile_)->
+      extension_service()->GetInstalledExtension(app_id_);
+  const bool requires_network = !extension ||
+      !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())
+    ContinueWithNetworkReady();
+  else
+    OnReadyToLaunch();
 }
 
 void StartupAppLauncher::InitializeTokenService() {
   delegate_->OnInitializingTokenService();
 
   ProfileOAuth2TokenService* profile_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile_);
   if (profile_token_service->RefreshTokenIsAvailable(
           signin_manager->GetAuthenticatedAccountId()) ||
       auth_params_.refresh_token.empty()) {
-    InitializeNetwork();
+    MaybeInitializeNetwork();
   } else {
     // Pass oauth2 refresh token from the auth file.
     // TODO(zelidrag): We should probably remove this option after M27.
     // TODO(fgorski): This can go when we have persistence implemented on PO2TS.
     // Unless the code is no longer needed.
     // TODO(rogerta): Now that this CL implements token persistence in PO2TS, is
     // this code still needed?  See above two TODOs.
     //
     // ProfileOAuth2TokenService triggers either OnRefreshTokenAvailable or
     // OnRefreshTokensLoaded. Given that we want to handle exactly one event,
     // whichever comes first, both handlers call RemoveObserver on PO2TS.
     // Handling any of the two events is the only way to resume the execution
     // and enable Cleanup method to be called, self-invoking a destructor.
     profile_token_service->AddObserver(this);
 
     profile_token_service->UpdateCredentials(
         "kiosk_mode@localhost",
         auth_params_.refresh_token);
   }
 }
 
 void StartupAppLauncher::OnRefreshTokenAvailable(
     const std::string& account_id) {
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)
       ->RemoveObserver(this);
-  InitializeNetwork();
+  MaybeInitializeNetwork();
 }
 
 void StartupAppLauncher::OnRefreshTokensLoaded() {
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)
       ->RemoveObserver(this);
-  InitializeNetwork();
+  MaybeInitializeNetwork();
 }
 
 void StartupAppLauncher::LaunchApp() {
   if (!ready_to_launch_) {
     NOTREACHED();
     LOG(ERROR) << "LaunchApp() called but launcher is not initialized.";
   }
 
   const Extension* extension = extensions::ExtensionSystem::Get(profile_)->
       extension_service()->GetInstalledExtension(app_id_);
@@ skipping 98 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