diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 18:53:34 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 18:53:34 +0000 |
| commit | 2bcc56e08363522d5155d281fa91b5b0a1f4df49 (patch) | |
| tree | 6bec0bcc7e75482bbad7946e869bf9a4cc9a3acb /chrome/plugin | |
| parent | 09af2247b5bfac76d72e415fb6656d24fa0f1f0d (diff) | |
| download | chromium_src-2bcc56e08363522d5155d281fa91b5b0a1f4df49.zip chromium_src-2bcc56e08363522d5155d281fa91b5b0a1f4df49.tar.gz chromium_src-2bcc56e08363522d5155d281fa91b5b0a1f4df49.tar.bz2 | |
Move content_plugin_client.h to content\public\plugin.
The plugin_carbon_interpose_mac.cc which intercepts system API's in plugin processes on the Mac has been moved to
content\plugin. The plugin_carbon_interpose shared library target which lives in chrome.gyp refers to this file.
This is a short term workaround while we look into switching the interposing mechanism on the mac.
Changes as part of creating a Content API
BUG=98716
Review URL: http://codereview.chromium.org/8224021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/DEPS | 2 | ||||
| -rw-r--r-- | chrome/plugin/chrome_content_plugin_client.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 { |