NavigationController prototype

webkit/browser/appcache/appcache.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 "webkit/browser/appcache/appcache.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 75 matching lines @@
 }
 
 AppCacheExecutableHandler* AppCache::GetExecutableHandler(int64 response_id) {
   HandlerMap::const_iterator found = executable_handlers_.find(response_id);
   if (found != executable_handlers_.end())
     return found->second;
   return NULL;
 }
 
 AppCacheExecutableHandler* AppCache::GetOrCreateExecutableHandler(
-    int64 response_id, net::IOBuffer* handler_source) {
+    int64 response_id, const std::string& raw_handler_source) {
   AppCacheExecutableHandler* handler = GetExecutableHandler(response_id);
   if (handler)
     return handler;
 
   GURL handler_url;
   const AppCacheEntry* entry = GetEntryAndUrlWithResponseId(
       response_id, &handler_url);
   if (!entry || !entry->IsExecutable())
     return NULL;
 
-  DCHECK(storage_->service()->handler_factory());
+  DCHECK(storage_->service()->executable_handler_factory());
   scoped_ptr<AppCacheExecutableHandler> own_ptr =
-      storage_->service()->handler_factory()->
-          CreateHandler(handler_url, handler_source);
+      storage_->service()->executable_handler_factory()->
+          CreateHandler(cache_id_, handler_url, raw_handler_source);
   handler = own_ptr.release();
   if (!handler)
     return NULL;
   executable_handlers_[response_id] = handler;
   return handler;
 }
 
 GURL AppCache::GetNamespaceEntryUrl(const NamespaceVector& namespaces,
                                     const GURL& namespace_url) const {
   size_t count = namespaces.size();
@@ skipping 176 matching lines @@
        iter !=  entries_.end(); ++iter) {
     infos->push_back(AppCacheResourceInfo());
     AppCacheResourceInfo& info = infos->back();
     info.url = iter->first;
     info.is_master = iter->second.IsMaster();
     info.is_manifest = iter->second.IsManifest();
     info.is_intercept = iter->second.IsIntercept();
     info.is_fallback = iter->second.IsFallback();
     info.is_foreign = iter->second.IsForeign();
     info.is_explicit = iter->second.IsExplicit();
+    info.is_executable = iter->second.IsExecutable();
     info.size = iter->second.response_size();
     info.response_id = iter->second.response_id();
   }
 }
 
 // static
 const Namespace* AppCache::FindNamespace(
     const NamespaceVector& namespaces,
     const GURL& url) {
   size_t count = namespaces.size();
   for (size_t i = 0; i < count; ++i) {
     if (namespaces[i].IsMatch(url))
       return &namespaces[i];
   }
   return NULL;
 }
 
 }  // namespace appcache