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

Unified Diff: content/app/content_main_runner.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 | « chrome_frame/test/net/fake_external_tab.cc ('k') | content/browser/resource_context_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/content_main_runner.cc
===================================================================
--- content/app/content_main_runner.cc (revision 133033)
+++ content/app/content_main_runner.cc (working copy)
@@ -27,6 +27,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/main_function_params.h"
#include "content/public/common/sandbox_init.h"
+#include "content/public/common/url_constants.h"
#include "crypto/nss_util.h"
#include "ipc/ipc_switches.h"
#include "media/base/media.h"
@@ -383,6 +384,8 @@
int exit_code;
if (delegate && delegate->BasicStartupComplete(&exit_code))
return exit_code;
+ DCHECK(!delegate || content::GetContentClient()) <<
+ "BasicStartupComplete didn't set the content client";
completed_basic_startup_ = true;
@@ -444,6 +447,7 @@
ui::RegisterPathProvider();
content::RegisterPathProvider();
+ content::RegisterContentSchemes(true);
CHECK(icu_util::Initialize());
« no previous file with comments | « chrome_frame/test/net/fake_external_tab.cc ('k') | content/browser/resource_context_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698