diff options
| -rw-r--r-- | chrome/chrome.gyp | 2 | ||||
| -rw-r--r-- | chrome/plugin/DEPS | 2 | ||||
| -rw-r--r-- | chrome/plugin/chrome_content_plugin_client.h | 2 | ||||
| -rw-r--r-- | content/content_plugin.gypi | 2 | ||||
| -rw-r--r-- | content/plugin/DEPS | 1 | ||||
| -rw-r--r-- | content/plugin/plugin_carbon_interpose_mac.cc (renamed from chrome/browser/plugin_carbon_interpose_mac.cc) | 0 | ||||
| -rw-r--r-- | content/plugin/plugin_thread.cc | 2 | ||||
| -rw-r--r-- | content/public/plugin/content_plugin_client.h (renamed from content/plugin/content_plugin_client.h) | 7 | ||||
| -rw-r--r-- | content/shell/shell_content_plugin_client.h | 2 |
9 files changed, 11 insertions, 9 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 5a9eaa9..e9a90e2 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1109,7 +1109,7 @@ 'chrome_dll', ], 'sources': [ - 'browser/plugin_carbon_interpose_mac.cc', + '../content/plugin/plugin_carbon_interpose_mac.cc', ], 'include_dirs': [ '..', diff --git a/chrome/plugin/DEPS b/chrome/plugin/DEPS index 3851c20..df419af 100644 --- a/chrome/plugin/DEPS +++ b/chrome/plugin/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+content/plugin", + "+content/public/plugin", "+grit", ] diff --git a/chrome/plugin/chrome_content_plugin_client.h b/chrome/plugin/chrome_content_plugin_client.h index b743660..dcefd36 100644 --- a/chrome/plugin/chrome_content_plugin_client.h +++ b/chrome/plugin/chrome_content_plugin_client.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "content/plugin/content_plugin_client.h" +#include "content/public/plugin/content_plugin_client.h" namespace chrome { diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi index e1dd81d..fd7d3f4 100644 --- a/content/content_plugin.gypi +++ b/content/content_plugin.gypi @@ -14,7 +14,6 @@ 'sources': [ # All .cc, .h, .m, and .mm files under plugins except for tests and # mocks. - 'plugin/content_plugin_client.h', 'plugin/plugin_channel.cc', 'plugin/plugin_channel.h', 'plugin/plugin_interpose_util_mac.mm', @@ -30,6 +29,7 @@ 'plugin/webplugin_delegate_stub.h', 'plugin/webplugin_proxy.cc', 'plugin/webplugin_proxy.h', + 'public/plugin/content_plugin_client.h', ], # These are layered in conditionals in the event other platforms # end up using this module as well. diff --git a/content/plugin/DEPS b/content/plugin/DEPS index f5b3524..6a3fdfa 100644 --- a/content/plugin/DEPS +++ b/content/plugin/DEPS @@ -1,5 +1,6 @@ include_rules = [ "-chrome", + "+content/public/plugin", "+sandbox/src", "+skia/ext", "+third_party/npapi", diff --git a/chrome/browser/plugin_carbon_interpose_mac.cc b/content/plugin/plugin_carbon_interpose_mac.cc index 20a7d54..20a7d54 100644 --- a/chrome/browser/plugin_carbon_interpose_mac.cc +++ b/content/plugin/plugin_carbon_interpose_mac.cc diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index f7840df..89c8307 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -23,7 +23,7 @@ #include "content/common/content_switches.h" #include "content/common/npobject_util.h" #include "content/common/plugin_messages.h" -#include "content/plugin/content_plugin_client.h" +#include "content/public/plugin/content_plugin_client.h" #include "ipc/ipc_channel_handle.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/plugin_lib.h" diff --git a/content/plugin/content_plugin_client.h b/content/public/plugin/content_plugin_client.h index e2640d9..346765a 100644 --- a/content/plugin/content_plugin_client.h +++ b/content/public/plugin/content_plugin_client.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_PLUGIN_CONTENT_PLUGIN_CLIENT_H_ -#define CONTENT_PLUGIN_CONTENT_PLUGIN_CLIENT_H_ +#ifndef CONTENT_PUBLIC_PLUGIN_CONTENT_PLUGIN_CLIENT_H_ +#define CONTENT_PUBLIC_PLUGIN_CONTENT_PLUGIN_CLIENT_H_ #pragma once #include "base/string16.h" @@ -20,4 +20,5 @@ class ContentPluginClient { } // namespace content -#endif // CONTENT_PLUGIN_CONTENT_PLUGIN_CLIENT_H_ +#endif // CONTENT_PUBLIC_PLUGIN_CONTENT_PLUGIN_CLIENT_H_ + diff --git a/content/shell/shell_content_plugin_client.h b/content/shell/shell_content_plugin_client.h index 0fd0bdf..382987b 100644 --- a/content/shell/shell_content_plugin_client.h +++ b/content/shell/shell_content_plugin_client.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "content/plugin/content_plugin_client.h" +#include "content/public/plugin/content_plugin_client.h" namespace content { |