diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 06:04:49 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 06:04:49 +0000 |
| commit | ca10046545d16cfd705fbfc356d97710f47cedee (patch) | |
| tree | 66d60515921d0229911b12c318b39bfda2c2e00b /chrome/common | |
| parent | 71aaa7aa371e39947d951addfcdf32f2cda353ac (diff) | |
| download | chromium_src-ca10046545d16cfd705fbfc356d97710f47cedee.zip chromium_src-ca10046545d16cfd705fbfc356d97710f47cedee.tar.gz chromium_src-ca10046545d16cfd705fbfc356d97710f47cedee.tar.bz2 | |
Failed compile on Chromium builder dbg
Revert 52072 - Pass notifications to the browser on access to the appcache main resource manifest.
BUG=45230
TEST=browser_tests
Review URL: http://codereview.chromium.org/2808046
TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/2925008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/appcache/appcache_dispatcher.cc | 5 | ||||
| -rw-r--r-- | chrome/common/appcache/appcache_dispatcher.h | 3 | ||||
| -rw-r--r-- | chrome/common/render_messages_internal.h | 11 |
3 files changed, 5 insertions, 14 deletions
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, |