Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: chrome/browser/browser_main.cc

Issue 17426: remove chrome dependencies from win sandboxing headers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 7732)
+++ chrome/browser/browser_main.cc (working copy)
@@ -5,7 +5,11 @@
#include "build/build_config.h"
#include "base/command_line.h"
+#include "chrome/common/main_function_params.h"
+
+#if defined(OS_WIN)
#include "sandbox/src/sandbox.h"
+#endif
// TODO(port): several win-only methods have been pulled out of this, but
// BrowserMain() as a whole needs to be broken apart so that it's usable by
@@ -141,8 +145,11 @@
} // namespace
// Main routine for running as the Browser process.
-int BrowserMain(CommandLine &parsed_command_line,
- sandbox::BrokerServices* broker_services) {
+int BrowserMain(const MainFunctionParams& parameters) {
+ CommandLine& parsed_command_line = parameters.command_line_;
+ sandbox::BrokerServices* broker_services =
+ parameters.sandbox_info_.BrokerServices();
+
// WARNING: If we get a WM_ENDSESSION objects created on the stack here
// are NOT deleted. If you need something to run during WM_ENDSESSION add it
// to browser_shutdown::Shutdown or BrowserProcess::EndSession.
@@ -503,8 +510,7 @@
// TODO(port): merge this with above. Just a stub for now, not meant as a place
// to duplicate code.
// Main routine for running as the Browser process.
-int BrowserMain(CommandLine &parsed_command_line,
- sandbox::BrokerServices* broker_services) {
+int BrowserMain(const MainFunctionParams& parameters) {
return StartPlatformMessageLoop();
}

Powered by Google App Engine
This is Rietveld 408576698