diff options
26 files changed, 36 insertions, 100 deletions
diff --git a/chrome/browser/appcache/appcache_frontend_proxy.cc b/chrome/browser/appcache/appcache_frontend_proxy.cc index ded44a1..fe39029 100644 --- a/chrome/browser/appcache/appcache_frontend_proxy.cc +++ b/chrome/browser/appcache/appcache_frontend_proxy.cc @@ -35,7 +35,6 @@ void AppCacheFrontendProxy::OnLogMessage(int host_id, sender_->Send(new AppCacheMsg_LogMessage(host_id, log_level, message)); } -void AppCacheFrontendProxy::OnContentBlocked(int host_id, - const GURL& manifest_url) { - sender_->Send(new AppCacheMsg_ContentBlocked(host_id, manifest_url)); +void AppCacheFrontendProxy::OnContentBlocked(int host_id) { + sender_->Send(new AppCacheMsg_ContentBlocked(host_id)); } diff --git a/chrome/browser/appcache/appcache_frontend_proxy.h b/chrome/browser/appcache/appcache_frontend_proxy.h index 1476580..90b9446 100644 --- a/chrome/browser/appcache/appcache_frontend_proxy.h +++ b/chrome/browser/appcache/appcache_frontend_proxy.h @@ -29,8 +29,7 @@ class AppCacheFrontendProxy : public appcache::AppCacheFrontend { int num_total, int num_complete); virtual void OnLogMessage(int host_id, appcache::LogLevel log_level, const std::string& message); - virtual void OnContentBlocked(int host_id, - const GURL& manifest_url); + virtual void OnContentBlocked(int host_id); private: IPC::Message::Sender* sender_; diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 92c2182..4905ad5 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -835,7 +835,6 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(ViewHostMsg_PageContents, OnPageContents) IPC_MESSAGE_HANDLER(ViewHostMsg_PageTranslated, OnPageTranslated) IPC_MESSAGE_HANDLER(ViewHostMsg_ContentBlocked, OnContentBlocked) - IPC_MESSAGE_HANDLER(ViewHostMsg_AppCacheAccessed, OnAppCacheAccessed) IPC_MESSAGE_HANDLER(ViewHostMsg_WebDatabaseAccessed, OnWebDatabaseAccessed) IPC_MESSAGE_HANDLER(ViewHostMsg_AccessibilityTree, OnAccessibilityTree) IPC_MESSAGE_HANDLER(ViewHostMsg_FocusedNodeChanged, OnMsgFocusedNodeChanged) @@ -1932,15 +1931,6 @@ void RenderViewHost::OnContentBlocked(ContentSettingsType type) { content_settings_delegate->OnContentBlocked(type); } -void RenderViewHost::OnAppCacheAccessed(const GURL& manifest_url, - bool blocked_by_policy) { - RenderViewHostDelegate::ContentSettings* content_settings_delegate = - delegate_->GetContentSettingsDelegate(); - if (content_settings_delegate) - content_settings_delegate->OnAppCacheAccessed(manifest_url, - blocked_by_policy); -} - void RenderViewHost::OnWebDatabaseAccessed(const GURL& url, const string16& name, const string16& display_name, diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index c62f6ce..25d3c15 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -640,7 +640,6 @@ class RenderViewHost : public RenderWidgetHost { const std::string& translated_lang, TranslateErrors::Type error_type); void OnContentBlocked(ContentSettingsType type); - void OnAppCacheAccessed(const GURL& manifest_url, bool blocked_by_policy); void OnWebDatabaseAccessed(const GURL& url, const string16& name, const string16& display_name, diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h index a5fca32..a0728a2 100644 --- a/chrome/browser/renderer_host/render_view_host_delegate.h +++ b/chrome/browser/renderer_host/render_view_host_delegate.h @@ -342,13 +342,6 @@ class RenderViewHostDelegate { unsigned long estimated_size, bool blocked_by_policy) = 0; - // Called when a specific appcache in the current page was accessed. If - // access was blocked due to the user's content settings, - // |blocked_by_policy| should eb true, and this function should invoke - // OnContentBlocked. - virtual void OnAppCacheAccessed(const GURL& manifest_url, - bool blocked_by_policy) = 0; - // Called when geolocation permission was set in a frame on the current // page. virtual void OnGeolocationPermissionSet(const GURL& requesting_frame, diff --git a/chrome/browser/tab_contents/tab_specific_content_settings.cc b/chrome/browser/tab_contents/tab_specific_content_settings.cc index 21aaa3f..891debd 100644 --- a/chrome/browser/tab_contents/tab_specific_content_settings.cc +++ b/chrome/browser/tab_contents/tab_specific_content_settings.cc @@ -73,16 +73,6 @@ void TabSpecificContentSettings::OnWebDatabaseAccessed( } } -void TabSpecificContentSettings::OnAppCacheAccessed( - const GURL& manifest_url, bool blocked_by_policy) { - if (blocked_by_policy) { - blocked_local_shared_objects_.appcaches()->AddAppCache(manifest_url); - OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES); - } else { - allowed_local_shared_objects_.appcaches()->AddAppCache(manifest_url); - } -} - void TabSpecificContentSettings::OnGeolocationPermissionSet( const GURL& requesting_origin, bool allowed) { diff --git a/chrome/browser/tab_contents/tab_specific_content_settings.h b/chrome/browser/tab_contents/tab_specific_content_settings.h index 648841e..8613b1a 100644 --- a/chrome/browser/tab_contents/tab_specific_content_settings.h +++ b/chrome/browser/tab_contents/tab_specific_content_settings.h @@ -65,8 +65,6 @@ class TabSpecificContentSettings const string16& display_name, unsigned long estimated_size, bool blocked_by_policy); - virtual void OnAppCacheAccessed(const GURL& manifest_url, - bool blocked_by_policy); virtual void OnGeolocationPermissionSet(const GURL& requesting_frame, bool allowed); diff --git a/chrome/common/appcache/appcache_dispatcher.cc b/chrome/common/appcache/appcache_dispatcher.cc index ff44f92..97e1cba 100644 --- a/chrome/common/appcache/appcache_dispatcher.cc +++ b/chrome/common/appcache/appcache_dispatcher.cc @@ -48,7 +48,6 @@ void AppCacheDispatcher::OnLogMessage( host_id, static_cast<appcache::LogLevel>(log_level), message); } -void AppCacheDispatcher::OnContentBlocked(int host_id, - const GURL& manifest_url) { - frontend_impl_.OnContentBlocked(host_id, manifest_url); +void AppCacheDispatcher::OnContentBlocked(int host_id) { + frontend_impl_.OnContentBlocked(host_id); } diff --git a/chrome/common/appcache/appcache_dispatcher.h b/chrome/common/appcache/appcache_dispatcher.h index 393e281..39cb225 100644 --- a/chrome/common/appcache/appcache_dispatcher.h +++ b/chrome/common/appcache/appcache_dispatcher.h @@ -34,8 +34,7 @@ class AppCacheDispatcher { void OnProgressEventRaised(const std::vector<int>& host_ids, const GURL& url, int num_total, int num_complete); void OnLogMessage(int host_id, int log_level, const std::string& message); - void OnContentBlocked(int host_id, - const GURL& manifest_url); + void OnContentBlocked(int host_id); AppCacheBackendProxy backend_proxy_; appcache::AppCacheFrontendImpl frontend_impl_; diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index b7cda04..20d5900 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -627,9 +627,8 @@ IPC_BEGIN_MESSAGES(View) std::string /* message */) // Notifies the renderer of the fact that AppCache access was blocked. - IPC_MESSAGE_CONTROL2(AppCacheMsg_ContentBlocked, - int /* host_id */, - GURL /* manifest_url */) + IPC_MESSAGE_CONTROL1(AppCacheMsg_ContentBlocked, + int /* host_id */) // Reply to the ViewHostMsg_QueryFormFieldAutoFill message with the // AutoFill suggestions. @@ -1265,12 +1264,6 @@ IPC_BEGIN_MESSAGES(ViewHost) IPC_MESSAGE_ROUTED1(ViewHostMsg_ContentBlocked, ContentSettingsType /* type of blocked content */) - // Tells the browser that a specific Appcache manifest in the current page - // was accessed. - IPC_MESSAGE_ROUTED2(ViewHostMsg_AppCacheAccessed, - GURL /* manifest url */, - bool /* blocked by policy */) - // Tells the browser that a specific Web database in the current page was // accessed. IPC_MESSAGE_ROUTED5(ViewHostMsg_WebDatabaseAccessed, diff --git a/chrome/renderer/renderer_webapplicationcachehost_impl.cc b/chrome/renderer/renderer_webapplicationcachehost_impl.cc index c4b6e71..6a2d6e3 100644 --- a/chrome/renderer/renderer_webapplicationcachehost_impl.cc +++ b/chrome/renderer/renderer_webapplicationcachehost_impl.cc @@ -35,17 +35,12 @@ void RendererWebApplicationCacheHostImpl::OnLogMessage( WebKit::WebString::fromUTF8(message.c_str()))); } -void RendererWebApplicationCacheHostImpl::OnContentBlocked( - const GURL& manifest_url) { - RenderThread::current()->Send(new ViewHostMsg_AppCacheAccessed( - routing_id_, manifest_url, true)); -} - -void RendererWebApplicationCacheHostImpl::OnCacheSelected( - int64 selected_cache_id, appcache::Status status) { - // TODO(jochen): Send a ViewHostMsg_AppCacheAccessed to the browser once this - // methods gets the manifest url passed. - WebApplicationCacheHostImpl::OnCacheSelected(selected_cache_id, status); +void RendererWebApplicationCacheHostImpl::OnContentBlocked() { + if (!content_blocked_) { + RenderThread::current()->Send(new ViewHostMsg_ContentBlocked( + routing_id_, CONTENT_SETTINGS_TYPE_COOKIES)); + content_blocked_ = true; + } } RenderView* RendererWebApplicationCacheHostImpl::GetRenderView() { diff --git a/chrome/renderer/renderer_webapplicationcachehost_impl.h b/chrome/renderer/renderer_webapplicationcachehost_impl.h index e709fa9..0e4173e 100644 --- a/chrome/renderer/renderer_webapplicationcachehost_impl.h +++ b/chrome/renderer/renderer_webapplicationcachehost_impl.h @@ -20,9 +20,7 @@ class RendererWebApplicationCacheHostImpl // appcache::WebApplicationCacheHostImpl methods. virtual void OnLogMessage(appcache::LogLevel log_level, const std::string& message); - virtual void OnContentBlocked(const GURL& manifest_url); - virtual void OnCacheSelected(int64 selected_cache_id, - appcache::Status status); + virtual void OnContentBlocked(); private: RenderView* GetRenderView(); diff --git a/webkit/appcache/appcache_frontend_impl.cc b/webkit/appcache/appcache_frontend_impl.cc index 5f490f3..2365a912d 100644 --- a/webkit/appcache/appcache_frontend_impl.cc +++ b/webkit/appcache/appcache_frontend_impl.cc @@ -60,11 +60,10 @@ void AppCacheFrontendImpl::OnLogMessage(int host_id, LogLevel log_level, host->OnLogMessage(log_level, message); } -void AppCacheFrontendImpl::OnContentBlocked(int host_id, - const GURL& manifest_url) { +void AppCacheFrontendImpl::OnContentBlocked(int host_id) { WebApplicationCacheHostImpl* host = GetHost(host_id); if (host) - host->OnContentBlocked(manifest_url); + host->OnContentBlocked(); } } // namespace appcache diff --git a/webkit/appcache/appcache_frontend_impl.h b/webkit/appcache/appcache_frontend_impl.h index e5852c7..6617082 100644 --- a/webkit/appcache/appcache_frontend_impl.h +++ b/webkit/appcache/appcache_frontend_impl.h @@ -23,7 +23,7 @@ class AppCacheFrontendImpl : public AppCacheFrontend { int num_total, int num_complete); virtual void OnLogMessage(int host_id, LogLevel log_level, const std::string& message); - virtual void OnContentBlocked(int host_id, const GURL& manifest_url); + virtual void OnContentBlocked(int host_id); }; } // namespace diff --git a/webkit/appcache/appcache_group_unittest.cc b/webkit/appcache/appcache_group_unittest.cc index 0f3f0b7..a88808d 100644 --- a/webkit/appcache/appcache_group_unittest.cc +++ b/webkit/appcache/appcache_group_unittest.cc @@ -42,8 +42,7 @@ class TestAppCacheFrontend : public appcache::AppCacheFrontend { const std::string& message) { } - virtual void OnContentBlocked(int host_id, - const GURL& manifest_url) { + virtual void OnContentBlocked(int host_id) { } int last_host_id_; diff --git a/webkit/appcache/appcache_host.cc b/webkit/appcache/appcache_host.cc index 7b9e58d..8553324 100644 --- a/webkit/appcache/appcache_host.cc +++ b/webkit/appcache/appcache_host.cc @@ -48,8 +48,7 @@ void AppCacheHost::SelectCache(const GURL& document_url, !pending_get_status_callback_); if (main_resource_blocked_) - frontend_->OnContentBlocked(host_id_, - blocked_manifest_url_); + frontend_->OnContentBlocked(host_id_); // First we handle an unusual case of SelectCache being called a second // time. Generally this shouldn't happen, but with bad content I think @@ -380,7 +379,7 @@ void AppCacheHost::OnUpdateComplete(AppCacheGroup* group) { } void AppCacheHost::OnContentBlocked(AppCacheGroup* group) { - frontend_->OnContentBlocked(host_id_, group->manifest_url()); + frontend_->OnContentBlocked(host_id_); } void AppCacheHost::SetSwappableCache(AppCacheGroup* group) { @@ -405,9 +404,8 @@ void AppCacheHost::LoadMainResourceCache(int64 cache_id) { service_->storage()->LoadCache(cache_id, this); } -void AppCacheHost::NotifyMainResourceBlocked(const GURL& manifest_url) { +void AppCacheHost::NotifyMainResourceBlocked() { main_resource_blocked_ = true; - blocked_manifest_url_ = manifest_url; } void AppCacheHost::AssociateCache(AppCache* cache) { diff --git a/webkit/appcache/appcache_host.h b/webkit/appcache/appcache_host.h index 7701f95..1c7534f 100644 --- a/webkit/appcache/appcache_host.h +++ b/webkit/appcache/appcache_host.h @@ -88,8 +88,8 @@ class AppCacheHost : public AppCacheStorage::Delegate, void LoadMainResourceCache(int64 cache_id); // Used to notify the host that the main resource was blocked by a policy. To - // work properly, this method needs to by invoked prior to cache selection. - void NotifyMainResourceBlocked(const GURL& manifest_url); + // work properly, this method needs to by invokde prior to cache selection. + void NotifyMainResourceBlocked(); // Used by the update job to keep track of which hosts are associated // with which pending master entries. @@ -197,8 +197,6 @@ class AppCacheHost : public AppCacheStorage::Delegate, // True if requests for this host were blocked by a policy. bool main_resource_blocked_; - GURL blocked_manifest_url_; - // List of objects observing us. ObserverList<Observer> observers_; diff --git a/webkit/appcache/appcache_host_unittest.cc b/webkit/appcache/appcache_host_unittest.cc index b3dc951..f2e8a04 100644 --- a/webkit/appcache/appcache_host_unittest.cc +++ b/webkit/appcache/appcache_host_unittest.cc @@ -61,7 +61,7 @@ class AppCacheHostTest : public testing::Test { const std::string& message) { } - virtual void OnContentBlocked(int host_id, const GURL& manifest_url) { + virtual void OnContentBlocked(int host_id) { } int last_host_id_; diff --git a/webkit/appcache/appcache_interfaces.h b/webkit/appcache/appcache_interfaces.h index 2ff2da7..b2a954e 100644 --- a/webkit/appcache/appcache_interfaces.h +++ b/webkit/appcache/appcache_interfaces.h @@ -63,8 +63,7 @@ class AppCacheFrontend { virtual void OnProgressEventRaised(const std::vector<int>& host_ids, const GURL& url, int num_total, int num_complete) = 0; - virtual void OnContentBlocked(int host_id, - const GURL& manifest_url) = 0; + virtual void OnContentBlocked(int host_id) = 0; virtual void OnLogMessage(int host_id, LogLevel log_level, const std::string& message) = 0; virtual ~AppCacheFrontend() {} diff --git a/webkit/appcache/appcache_request_handler.cc b/webkit/appcache/appcache_request_handler.cc index 28a9149..a0775ad 100644 --- a/webkit/appcache/appcache_request_handler.cc +++ b/webkit/appcache/appcache_request_handler.cc @@ -196,7 +196,7 @@ void AppCacheRequestHandler::OnMainResponseFound( if (ResourceType::IsFrame(resource_type_)) { if (was_blocked_by_policy) - host_->NotifyMainResourceBlocked(manifest_url); + host_->NotifyMainResourceBlocked(); if (cache_id != kNoCacheId) { // AppCacheHost loads and holds a reference to the main resource cache @@ -208,7 +208,7 @@ void AppCacheRequestHandler::OnMainResponseFound( } else { DCHECK(ResourceType::IsSharedWorker(resource_type_)); if (was_blocked_by_policy) - host_->frontend()->OnContentBlocked(host_->host_id(), manifest_url); + host_->frontend()->OnContentBlocked(host_->host_id()); } // 6.11.1 Navigating across documents, steps 10 and 14. diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc index db1eda7..1793209 100644 --- a/webkit/appcache/appcache_request_handler_unittest.cc +++ b/webkit/appcache/appcache_request_handler_unittest.cc @@ -39,7 +39,7 @@ class AppCacheRequestHandlerTest : public testing::Test { virtual void OnLogMessage(int host_id, appcache::LogLevel log_level, const std::string& message) {} - virtual void OnContentBlocked(int host_id, const GURL& manifest_url) {} + virtual void OnContentBlocked(int host_id) {} }; // Helper class run a test on our io_thread. The io_thread diff --git a/webkit/appcache/appcache_storage_impl.cc b/webkit/appcache/appcache_storage_impl.cc index 265ff30..b853a0c 100644 --- a/webkit/appcache/appcache_storage_impl.cc +++ b/webkit/appcache/appcache_storage_impl.cc @@ -1044,7 +1044,7 @@ void AppCacheStorageImpl::CheckPolicyAndCallOnMainResponseFound( FOR_EACH_DELEGATE( (*delegates), OnMainResponseFound(url, AppCacheEntry(), AppCacheEntry(), - kNoCacheId, manifest_url, true)); + kNoCacheId, GURL(), true)); return; } } diff --git a/webkit/appcache/appcache_storage_impl_unittest.cc b/webkit/appcache/appcache_storage_impl_unittest.cc index fa3c367..204f5e6 100644 --- a/webkit/appcache/appcache_storage_impl_unittest.cc +++ b/webkit/appcache/appcache_storage_impl_unittest.cc @@ -74,7 +74,7 @@ class AppCacheStorageImplTest : public testing::Test { explicit MockStorageDelegate(AppCacheStorageImplTest* test) : loaded_cache_id_(0), stored_group_success_(false), obsoleted_success_(false), found_cache_id_(kNoCacheId), - found_blocked_by_policy_(false), test_(test) { + test_(test) { } void OnCacheLoaded(AppCache* cache, int64 cache_id) { @@ -113,7 +113,6 @@ class AppCacheStorageImplTest : public testing::Test { found_fallback_entry_ = fallback_entry; found_cache_id_ = cache_id; found_manifest_url_ = manifest_url; - found_blocked_by_policy_ = was_blocked_by_policy; test_->ScheduleNextTask(); } @@ -131,7 +130,6 @@ class AppCacheStorageImplTest : public testing::Test { AppCacheEntry found_fallback_entry_; int64 found_cache_id_; GURL found_manifest_url_; - bool found_blocked_by_policy_; AppCacheStorageImplTest* test_; }; @@ -684,9 +682,7 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_FindNoMainResponse() { EXPECT_EQ(kEntryUrl, delegate()->found_url_); - // If the request was blocked by a policy, the manifest url is still valid. - EXPECT_TRUE(delegate()->found_manifest_url_.is_empty() || - delegate()->found_blocked_by_policy_); + EXPECT_TRUE(delegate()->found_manifest_url_.is_empty()); EXPECT_EQ(kNoCacheId, delegate()->found_cache_id_); EXPECT_EQ(kNoResponseId, delegate()->found_entry_.response_id()); EXPECT_EQ(kNoResponseId, delegate()->found_fallback_entry_.response_id()); @@ -746,7 +742,6 @@ class AppCacheStorageImplTest : public testing::Test { if (policy_.can_load_return_value_) { EXPECT_EQ(kEntryUrl, delegate()->found_url_); EXPECT_EQ(kManifestUrl, delegate()->found_manifest_url_); - EXPECT_FALSE(delegate()->found_blocked_by_policy_); EXPECT_EQ(1, delegate()->found_cache_id_); EXPECT_EQ(1, delegate()->found_entry_.response_id()); EXPECT_TRUE(delegate()->found_entry_.IsExplicit()); @@ -805,7 +800,6 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_BasicFindMainFallbackResponse() { EXPECT_EQ(kFallbackTestUrl, delegate()->found_url_); EXPECT_EQ(kManifestUrl, delegate()->found_manifest_url_); - EXPECT_FALSE(delegate()->found_blocked_by_policy_); EXPECT_EQ(1, delegate()->found_cache_id_); EXPECT_FALSE(delegate()->found_entry_.has_response_id()); EXPECT_EQ(2, delegate()->found_fallback_entry_.response_id()); @@ -852,7 +846,6 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_FindMainResponseWithMultipleHits() { EXPECT_EQ(kEntryUrl, delegate()->found_url_); EXPECT_EQ(kManifestUrl2, delegate()->found_manifest_url_); - EXPECT_FALSE(delegate()->found_blocked_by_policy_); EXPECT_EQ(2, delegate()->found_cache_id_); EXPECT_EQ(2, delegate()->found_entry_.response_id()); EXPECT_TRUE(delegate()->found_entry_.IsExplicit()); @@ -901,7 +894,6 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_NotFound(GURL expected_url, bool test_finished) { EXPECT_EQ(expected_url, delegate()->found_url_); EXPECT_TRUE(delegate()->found_manifest_url_.is_empty()); - EXPECT_FALSE(delegate()->found_blocked_by_policy_); EXPECT_EQ(kNoCacheId, delegate()->found_cache_id_); EXPECT_EQ(kNoResponseId, delegate()->found_entry_.response_id()); EXPECT_EQ(kNoResponseId, delegate()->found_fallback_entry_.response_id()); diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc index e75175d..06ac167 100644 --- a/webkit/appcache/appcache_update_job_unittest.cc +++ b/webkit/appcache/appcache_update_job_unittest.cc @@ -220,7 +220,7 @@ class MockFrontend : public AppCacheFrontend { const std::string& message) { } - virtual void OnContentBlocked(int host_id, const GURL& manifest_url) { + virtual void OnContentBlocked(int host_id) { } void AddExpectedEvent(const std::vector<int>& host_ids, EventID event_id) { diff --git a/webkit/appcache/web_application_cache_host_impl.h b/webkit/appcache/web_application_cache_host_impl.h index 17d66d7..84aa4d3 100644 --- a/webkit/appcache/web_application_cache_host_impl.h +++ b/webkit/appcache/web_application_cache_host_impl.h @@ -32,13 +32,12 @@ class WebApplicationCacheHostImpl : public WebKit::WebApplicationCacheHost { AppCacheBackend* backend() const { return backend_; } WebKit::WebApplicationCacheHostClient* client() const { return client_; } + void OnCacheSelected(int64 selected_cache_id, appcache::Status status); void OnStatusChanged(appcache::Status); void OnEventRaised(appcache::EventID); void OnProgressEventRaised(const GURL& url, int num_total, int num_complete); virtual void OnLogMessage(LogLevel log_level, const std::string& message) {} - virtual void OnContentBlocked(const GURL& manifest_url) {} - virtual void OnCacheSelected(int64 selected_cache_id, - appcache::Status status); + virtual void OnContentBlocked() {} // WebApplicationCacheHost methods virtual void willStartMainResourceRequest(WebKit::WebURLRequest&); diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc index b8e60e4..0c0379e 100644 --- a/webkit/tools/test_shell/simple_appcache_system.cc +++ b/webkit/tools/test_shell/simple_appcache_system.cc @@ -131,7 +131,7 @@ class SimpleFrontendProxy NOTREACHED(); } - virtual void OnContentBlocked(int host_id, const GURL& manifest_url) {} + virtual void OnContentBlocked(int host_id) {} private: friend class base::RefCountedThreadSafe<SimpleFrontendProxy>; |