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

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 10896: Re-do the way browser windows are shown:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month 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/app/chrome_dll_main.cc
===================================================================
--- chrome/app/chrome_dll_main.cc (revision 5374)
+++ chrome/app/chrome_dll_main.cc (working copy)
@@ -25,9 +25,9 @@
#include "sandbox/src/sandbox.h"
#include "tools/memory_watcher/memory_watcher.h"
-extern int BrowserMain(CommandLine &, int, sandbox::BrokerServices*);
-extern int RendererMain(CommandLine &, int, sandbox::TargetServices*);
-extern int PluginMain(CommandLine &, int, sandbox::TargetServices*);
+extern int BrowserMain(CommandLine&, sandbox::BrokerServices*);
+extern int RendererMain(CommandLine&, sandbox::TargetServices*);
+extern int PluginMain(CommandLine&, sandbox::TargetServices*);
// TODO(erikkay): isn't this already defined somewhere?
#define DLLEXPORT __declspec(dllexport)
@@ -36,7 +36,7 @@
extern "C" {
DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
sandbox::SandboxInterfaceInfo* sandbox_info,
- TCHAR* command_line, int show_command);
+ TCHAR* command_line);
}
namespace {
@@ -90,7 +90,7 @@
DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
sandbox::SandboxInterfaceInfo* sandbox_info,
- TCHAR* command_line, int show_command) {
+ TCHAR* command_line) {
// Register the invalid param handler and pure call handler to be able to
// notify breakpad when it happens.
_set_invalid_parameter_handler(InvalidParameter);
@@ -215,13 +215,13 @@
int rv;
if (process_type == switches::kRendererProcess) {
- rv = RendererMain(parsed_command_line, show_command, target_services);
+ rv = RendererMain(parsed_command_line, target_services);
} else if (process_type == switches::kPluginProcess) {
- rv = PluginMain(parsed_command_line, show_command, target_services);
+ rv = PluginMain(parsed_command_line, target_services);
} else if (process_type.empty()) {
int ole_result = OleInitialize(NULL);
DCHECK(ole_result == S_OK);
- rv = BrowserMain(parsed_command_line, show_command, broker_services);
+ rv = BrowserMain(parsed_command_line, broker_services);
OleUninitialize();
} else {
NOTREACHED() << "Unknown process type";

Powered by Google App Engine
This is Rietveld 408576698