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

Unified Diff: content/shell/shell_main_delegate.cc

Issue 9950040: Get chrome:// dev tool urls hooked up in content_shell. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 8 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
« no previous file with comments | « content/shell/shell_content_client.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_main_delegate.cc
===================================================================
--- content/shell/shell_main_delegate.cc (revision 133033)
+++ content/shell/shell_main_delegate.cc (working copy)
@@ -8,6 +8,7 @@
#include "base/file_path.h"
#include "base/path_service.h"
#include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
#include "content/shell/shell_browser_main.h"
#include "content/shell/shell_content_browser_client.h"
#include "content/shell/shell_content_plugin_client.h"
@@ -30,6 +31,12 @@
#if defined(OS_MACOSX)
OverrideFrameworkBundlePath();
#endif
+ const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ std::string process_type =
+ command_line.GetSwitchValueASCII(switches::kProcessType);
+ content::SetContentClient(&content_client_);
+ InitializeShellContentClient(process_type);
+
return false;
}
@@ -37,14 +44,6 @@
#if defined(OS_MACOSX)
OverrideChildProcessPath();
#endif // OS_MACOSX
-
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- std::string process_type =
- command_line.GetSwitchValueASCII(switches::kProcessType);
-
- content::SetContentClient(&content_client_);
- InitializeShellContentClient(process_type);
-
InitializeResourceBundle();
}
« no previous file with comments | « content/shell/shell_content_client.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698