diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 16:43:09 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 16:43:09 +0000 |
| commit | 31f376cae2b8ca1d7af8104745aa34991b33a30a (patch) | |
| tree | f983c932b0053c25363e3722f823bc71bf3a62bf /content | |
| parent | e40196e487d742a8fc97b94588ad6b48ec7e2054 (diff) | |
| download | chromium_src-31f376cae2b8ca1d7af8104745aa34991b33a30a.zip chromium_src-31f376cae2b8ca1d7af8104745aa34991b33a30a.tar.gz chromium_src-31f376cae2b8ca1d7af8104745aa34991b33a30a.tar.bz2 | |
Move PluginServiceFilter to content/public/browser.
BUG=98716
R=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9677030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/plugin_service_impl.cc | 2 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_message_filter.cc | 2 | ||||
| -rw-r--r-- | content/content_browser.gypi | 2 | ||||
| -rw-r--r-- | content/public/browser/plugin_service_filter.h (renamed from content/browser/plugin_service_filter.h) | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index c2a9b34..789d254 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc @@ -17,7 +17,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "content/browser/plugin_loader_posix.h" -#include "content/browser/plugin_service_filter.h" #include "content/browser/ppapi_plugin_process_host.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/renderer_host/render_view_host_impl.h" @@ -29,6 +28,7 @@ #include "content/public/browser/content_browser_client.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/plugin_service_filter.h" #include "content/public/browser/resource_context.h" #include "content/public/common/content_switches.h" #include "content/public/common/process_type.h" diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 79c191e..829b2d8 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -21,7 +21,6 @@ #include "content/browser/download/download_types.h" #include "content/browser/in_process_webkit/dom_storage_context_impl.h" #include "content/browser/plugin_process_host.h" -#include "content/browser/plugin_service_filter.h" #include "content/browser/plugin_service_impl.h" #include "content/browser/ppapi_plugin_process_host.h" #include "content/browser/renderer_host/render_process_host_impl.h" @@ -35,6 +34,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/media_observer.h" +#include "content/public/browser/plugin_service_filter.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/resource_context.h" #include "content/public/browser/user_metrics.h" diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 3f853c2..3fe677e 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -96,6 +96,7 @@ 'public/browser/page_navigator.cc', 'public/browser/page_navigator.h', 'public/browser/plugin_data_remover.h', + 'public/browser/plugin_service_filter.h', 'public/browser/plugin_service.h', 'public/browser/profiler_controller.h', 'public/browser/profiler_subscriber.h', @@ -405,7 +406,6 @@ 'browser/plugin_process_host_mac.cc', 'browser/plugin_service_impl.cc', 'browser/plugin_service_impl.h', - 'browser/plugin_service_filter.h', 'browser/power_save_blocker.h', 'browser/power_save_blocker_android.cc', 'browser/power_save_blocker_common.cc', diff --git a/content/browser/plugin_service_filter.h b/content/public/browser/plugin_service_filter.h index 49aaaa2..05c2afa 100644 --- a/content/browser/plugin_service_filter.h +++ b/content/public/browser/plugin_service_filter.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_PLUGIN_FILTER_H_ -#define CONTENT_BROWSER_PLUGIN_FILTER_H_ +#ifndef CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_FILTER_H_ +#define CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_FILTER_H_ #pragma once -#include "googleurl/src/gurl.h" +class GURL; namespace webkit { struct WebPluginInfo; @@ -32,4 +32,4 @@ class PluginServiceFilter { } // namespace content -#endif // CONTENT_BROWSER_PLUGIN_FILTER_H_ +#endif // CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_FILTER_H_ |