Offline By Default

shell/application_manager/network_fetcher.h

 // Copyright 2015 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.
 
 #ifndef SHELL_APPLICATION_MANAGER_NETWORK_FETCHER_H_
 #define SHELL_APPLICATION_MANAGER_NETWORK_FETCHER_H_
 
 #include "shell/application_manager/fetcher.h"
 
 #include "base/files/file_path.h"
@@ skipping 10 matching lines @@
  public:
   NetworkFetcher(bool disable_cache,
                  const GURL& url,
                  mojo::URLResponseDiskCache* url_response_disk_cache,
                  mojo::NetworkService* network_service,
                  const FetchCallback& loader_callback);
 
   ~NetworkFetcher() override;
 
  private:
-  // TODO(hansmuller): Revisit this when a real peek operation is available.
-  static const MojoDeadline kPeekTimeout = MOJO_DEADLINE_INDEFINITE;
-
-  // The network fetcher will first try to request an application from the
-  // network. If that request fails, it will then try to request the application
-  // from the cache.
-  enum RequestType {
-    FROM_NETWORK,
-    FROM_CACHE,
-  };
-
   const GURL& GetURL() const override;
   GURL GetRedirectURL() const override;
 
   mojo::URLResponsePtr AsURLResponse(base::TaskRunner* task_runner,
                                      uint32_t skip) override;
 
-  static void RecordCacheToURLMapping(const base::FilePath& path,
-                                      const GURL& url);
-
-  void OnFileRetrievedFromCache(
-      base::Callback<void(const base::FilePath&, bool)> callback,
-      mojo::Array<uint8_t> path_as_array,
-      mojo::Array<uint8_t> cache_dir);
-
   void AsPath(
       base::TaskRunner* task_runner,
       base::Callback<void(const base::FilePath&, bool)> callback) override;
 
   std::string MimeType() override;
 
   bool HasMojoMagic() override;
 
   bool PeekFirstLine(std::string* line) override;
 
-  void StartNetworkRequest(RequestType request_type);
+  // Returns whether the content can be loaded directly from cache. Local hosts
+  // are not loaded from cache to allow effective development.
+  bool CanLoadDirectlyFromCache();
 
-  void OnLoadComplete(RequestType request_type, mojo::URLResponsePtr response);
+  void LoadFromCache(bool sheduleUpdate);

[ppi, 2015/09/15 15:21:23]

We probably want "shedule_update" (I see that I got it wrong in the comment,
sorry about that!)

[qsr, 2015/09/16 11:46:39]

Done.

+
+  void OnCachedResponseReceived(bool sheduleUpdate,
+                                mojo::URLResponsePtr response,
+                                mojo::Array<uint8_t> path_as_array,
+                                mojo::Array<uint8_t> cache_dir);
+
+  void StartNetworkRequest();
+
+  void OnLoadComplete(mojo::URLResponsePtr response);
+
+  void OnFileSavedToCache(mojo::Array<uint8_t> path_as_array,
+                          mojo::Array<uint8_t> cache_dir);
+
+  static void RecordCacheToURLMapping(const base::FilePath& path,
+                                      const GURL& url);
 
   const bool disable_cache_;
   const GURL url_;
   mojo::URLResponseDiskCache* url_response_disk_cache_;
   mojo::NetworkService* network_service_;
   mojo::URLLoaderPtr url_loader_;
   mojo::URLResponsePtr response_;
   base::FilePath path_;
   base::WeakPtrFactory<NetworkFetcher> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkFetcher);
 };
 
 }  // namespace shell
 
 #endif  // SHELL_APPLICATION_MANAGER_NETWORK_FETCHER_H_