diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/pepper_plugin_delegate.h | 1 | ||||
| -rw-r--r-- | webkit/tools/test_shell/simple_appcache_system.cc | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/webkit/glue/plugins/pepper_plugin_delegate.h b/webkit/glue/plugins/pepper_plugin_delegate.h index 5e6f9a2..97f775a 100644 --- a/webkit/glue/plugins/pepper_plugin_delegate.h +++ b/webkit/glue/plugins/pepper_plugin_delegate.h @@ -12,7 +12,6 @@ #include "base/ref_counted.h" #include "base/shared_memory.h" #include "base/sync_socket.h" -#include "base/task.h" #include "gfx/size.h" #include "googleurl/src/gurl.h" #include "ppapi/c/pp_completion_callback.h" diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc index 311be6c..0ffbeeb 100644 --- a/webkit/tools/test_shell/simple_appcache_system.cc +++ b/webkit/tools/test_shell/simple_appcache_system.cc @@ -4,8 +4,10 @@ #include "webkit/tools/test_shell/simple_appcache_system.h" +#include <string> +#include <vector> + #include "base/callback.h" -#include "base/lock.h" #include "base/task.h" #include "base/waitable_event.h" #include "webkit/appcache/appcache_interceptor.h" @@ -63,15 +65,15 @@ class SimpleFrontendProxy const appcache::AppCacheInfo& info) { if (!system_) return; - if (system_->is_io_thread()) + if (system_->is_io_thread()) { system_->ui_message_loop()->PostTask(FROM_HERE, NewRunnableMethod( this, &SimpleFrontendProxy::OnCacheSelected, host_id, info)); - else if (system_->is_ui_thread()) { + } else if (system_->is_ui_thread()) { system_->frontend_impl_.OnCacheSelected(host_id, info); - } - else + } else { NOTREACHED(); + } } virtual void OnStatusChanged(const std::vector<int>& host_ids, |