summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-09 20:28:44 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-09 20:28:44 +0000
commita1a130f7da9191abecf15b3c27e2aa7ee1faacb3 (patch)
tree3a9c6ad25ec53f05a4380ffac1a7932f66107a0d /chrome/plugin
parentfd26b925c589b600c7d12f55554ad1097bad6b87 (diff)
downloadchromium_src-a1a130f7da9191abecf15b3c27e2aa7ee1faacb3.zip
chromium_src-a1a130f7da9191abecf15b3c27e2aa7ee1faacb3.tar.gz
chromium_src-a1a130f7da9191abecf15b3c27e2aa7ee1faacb3.tar.bz2
remove chrome dependencies from win sandboxing headers. Wrap sandbox code to
make the main routine a little cleaner. Unify the parameters of each of the "main" entry points so we can more easily abstract platform differences in the future. BUG=5323 Review URL: http://codereview.chromium.org/17426 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/plugin_main.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index 94f50bc..ac9fd90 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -8,14 +8,18 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/logging_chrome.h"
+#include "chrome/common/main_function_params.h"
#include "chrome/common/win_util.h"
#include "chrome/plugin/plugin_process.h"
#include "chrome/test/injection_test_dll.h"
#include "sandbox/src/sandbox.h"
// mainline routine for running as the plugin process
-int PluginMain(CommandLine &parsed_command_line,
- sandbox::TargetServices* target_services) {
+int PluginMain(const MainFunctionParams& parameters) {
+ CommandLine& parsed_command_line = parameters.command_line_;
+ sandbox::TargetServices* target_services =
+ parameters.sandbox_info_.TargetServices();
+
// The main thread of the plugin services IO.
MessageLoopForIO main_message_loop;
std::wstring app_name = chrome::kBrowserAppName;