4 files changed, 16 insertions, 0 deletions
diff --git a/chrome/common/chrome_plugin_api.h b/chrome/common/chrome_plugin_api.h
index 1dd08727..af21699 100644
--- a/chrome/common/chrome_plugin_api.h
+++ b/chrome/common/chrome_plugin_api.h
@@ -67,6 +67,7 @@ typedef unsigned char CPBool;
 typedef enum {
   CP_PROCESS_BROWSER = 0,
   CP_PROCESS_PLUGIN,
+  CP_PROCESS_RENDERER,
 } CPProcessType;
 
 // Return codes.  Error values are negative.
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 47f3080..c36d710 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -330,6 +330,9 @@ const wchar_t kUseLowFragHeapCrt[] = L"use-lf-heap";
 const wchar_t kGearsPluginPathOverride[] = L"gears-plugin-path";
 #endif
 
+// Switch to load Gears in the renderer process.
+const wchar_t kGearsInRenderer[] = L"gears-in-renderer";
+
 // Enable new HTTP stack.
 const wchar_t kUseNewHttp[] = L"new-http";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index fbffc88..11ce1bc 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -137,6 +137,8 @@ extern const wchar_t kUseLowFragHeapCrt[];
 extern const wchar_t kGearsPluginPathOverride[];
 #endif
 
+extern const wchar_t kGearsInRenderer[];
+
 extern const wchar_t kUseNewHttp[];
 
 extern const wchar_t kJavaScriptDebuggerPath[];
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 334b902..841f661 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -650,6 +650,16 @@ IPC_BEGIN_MESSAGES(ViewHost, 2)
                               std::wstring /* filename */,
                               std::string /* actual mime type for url */)
 
+  // Retrieve the data directory associated with the renderer's profile.
+  IPC_SYNC_MESSAGE_CONTROL0_1(ViewHostMsg_GetDataDir,
+                              std::wstring /* data_dir_retval */)
+
+  // Allows a chrome plugin loaded in a renderer process to send arbitrary
+  // data to an instance of the same plugin loaded in the browser process.
+  IPC_MESSAGE_CONTROL2(ViewHostMsg_PluginMessage,
+                       std::wstring /* dll_path of plugin */,
+                       std::vector<uint8> /* opaque data */)
+
   // Requests spellcheck for a word.
   IPC_SYNC_MESSAGE_ROUTED1_2(ViewHostMsg_SpellCheck,
                              std::wstring /* word to check */,