Get chrome:// dev tool urls hooked up in content_shell.

Review URL: https://chromiumcodereview.appspot.com/9950040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133107 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 18 insertions, 8 deletions

diff --git a/content/shell/shell_content_client.cc b/content/shell/shell_content_client.cc
index 61004fe..64ee8ea 100644
--- a/content/shell/shell_content_client.cc
+++ b/content/shell/shell_content_client.cc
@@ -27,6 +27,11 @@ void ShellContentClient::AddNPAPIPlugins(
     webkit::npapi::PluginList* plugin_list) {
 }
 
+void ShellContentClient::AddAdditionalSchemes(
+    std::vector<std::string>* standard_schemes,
+    std::vector<std::string>* savable_schemes) {
+}
+
 bool ShellContentClient::HasWebUIScheme(const GURL& url) const {
   // There are no WebUI URLs in content_shell.
   return false;
diff --git a/content/shell/shell_content_client.h b/content/shell/shell_content_client.h
index a7abbf34..6a740af 100644
--- a/content/shell/shell_content_client.h
+++ b/content/shell/shell_content_client.h
@@ -6,6 +6,9 @@
 #define CONTENT_SHELL_SHELL_CONTENT_CLIENT_H_
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "base/compiler_specific.h"
 #include "content/public/common/content_client.h"
 
@@ -21,6 +24,9 @@ class ShellContentClient : public ContentClient {
       std::vector<content::PepperPluginInfo>* plugins) OVERRIDE;
   virtual void AddNPAPIPlugins(
       webkit::npapi::PluginList* plugin_list) OVERRIDE;
+  virtual void AddAdditionalSchemes(
+      std::vector<std::string>* standard_schemes,
+      std::vector<std::string>* savable_schemes) OVERRIDE;
   virtual bool HasWebUIScheme(const GURL& url) const OVERRIDE;
   virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE;
   virtual std::string GetUserAgent() const OVERRIDE;
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc
index 031f031..06e2907 100644
--- a/content/shell/shell_main_delegate.cc
+++ b/content/shell/shell_main_delegate.cc
@@ -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 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
 #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 @@ void ShellMainDelegate::PreSandboxStartup() {
 #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();
 }