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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/shell_main_delegate.h" 5 #include "content/shell/shell_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
11 #include "content/public/common/url_constants.h"
11 #include "content/shell/shell_browser_main.h" 12 #include "content/shell/shell_browser_main.h"
12 #include "content/shell/shell_content_browser_client.h" 13 #include "content/shell/shell_content_browser_client.h"
13 #include "content/shell/shell_content_plugin_client.h" 14 #include "content/shell/shell_content_plugin_client.h"
14 #include "content/shell/shell_content_renderer_client.h" 15 #include "content/shell/shell_content_renderer_client.h"
15 #include "content/shell/shell_content_utility_client.h" 16 #include "content/shell/shell_content_utility_client.h"
16 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
17 #include "ui/base/ui_base_paths.h" 18 #include "ui/base/ui_base_paths.h"
18 19
19 #if defined(OS_MACOSX) 20 #if defined(OS_MACOSX)
20 #include "content/shell/paths_mac.h" 21 #include "content/shell/paths_mac.h"
(...skipping 14 matching lines...) Expand all
35 36
36 void ShellMainDelegate::PreSandboxStartup() { 37 void ShellMainDelegate::PreSandboxStartup() {
37 #if defined(OS_MACOSX) 38 #if defined(OS_MACOSX)
38 OverrideChildProcessPath(); 39 OverrideChildProcessPath();
39 #endif // OS_MACOSX 40 #endif // OS_MACOSX
40 41
41 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 42 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
42 std::string process_type = 43 std::string process_type =
43 command_line.GetSwitchValueASCII(switches::kProcessType); 44 command_line.GetSwitchValueASCII(switches::kProcessType);
44 45
46 content::RegisterContentSchemes(NULL);
michaeln 2012/03/31 01:30:06 This is needed so the 'chrome' scheme is parsed in
45 content::SetContentClient(&content_client_); 47 content::SetContentClient(&content_client_);
46 InitializeShellContentClient(process_type); 48 InitializeShellContentClient(process_type);
47 49
48 InitializeResourceBundle(); 50 InitializeResourceBundle();
49 } 51 }
50 52
51 void ShellMainDelegate::SandboxInitialized(const std::string& process_type) { 53 void ShellMainDelegate::SandboxInitialized(const std::string& process_type) {
52 } 54 }
53 55
54 int ShellMainDelegate::RunProcess( 56 int ShellMainDelegate::RunProcess(
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 FilePath pak_file; 115 FilePath pak_file;
114 #if defined(OS_MACOSX) 116 #if defined(OS_MACOSX)
115 pak_file = GetResourcesPakFilePath(); 117 pak_file = GetResourcesPakFilePath();
116 #else 118 #else
117 FilePath pak_dir; 119 FilePath pak_dir;
118 PathService::Get(base::DIR_MODULE, &pak_dir); 120 PathService::Get(base::DIR_MODULE, &pak_dir);
119 pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")); 121 pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
120 #endif 122 #endif
121 ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file); 123 ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file);
122 } 124 }
OLDNEW
« content/browser/resource_context_impl.cc ('K') | « content/browser/resource_context_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698