diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 21:56:11 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 21:56:11 +0000 |
| commit | 415c2cdea5dfa8bc87bd36a91bdb8473026f943f (patch) | |
| tree | 22aefe975f1be77a1bb18cdd96aeb86fbd96e096 /chrome/plugin | |
| parent | 5471bc3e9d08d1d955c96a8193ee2d9638c1591a (diff) | |
| download | chromium_src-415c2cdea5dfa8bc87bd36a91bdb8473026f943f.zip chromium_src-415c2cdea5dfa8bc87bd36a91bdb8473026f943f.tar.gz chromium_src-415c2cdea5dfa8bc87bd36a91bdb8473026f943f.tar.bz2 | |
Move some chrome\common code to content in preparation for moving chrome\gpu.
TBR=avi
Review URL: http://codereview.chromium.org/6686002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77868 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/plugin_main.cc | 2 | ||||
| -rw-r--r-- | chrome/plugin/plugin_main_mac.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc index fa45585..a3e9174 100644 --- a/chrome/plugin/plugin_main.cc +++ b/chrome/plugin/plugin_main.cc @@ -18,9 +18,9 @@ #include "chrome/common/default_plugin.h" #include "chrome/common/hi_res_timer_manager.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/main_function_params.h" #include "chrome/plugin/plugin_thread.h" #include "content/common/child_process.h" +#include "content/common/main_function_params.h" #include "ui/base/system_monitor/system_monitor.h" #if defined(OS_WIN) diff --git a/chrome/plugin/plugin_main_mac.mm b/chrome/plugin/plugin_main_mac.mm index 5d10a3b..122dc39 100644 --- a/chrome/plugin/plugin_main_mac.mm +++ b/chrome/plugin/plugin_main_mac.mm @@ -5,9 +5,9 @@ #include "base/environment.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "chrome/common/chrome_application_mac.h" #include "chrome/common/plugin_carbon_interpose_constants_mac.h" #include "chrome/plugin/plugin_interpose_util_mac.h" +#include "content/common/chrome_application_mac.h" #if !defined(__LP64__) void TrimInterposeEnvironment() { |