| OLD | NEW |
| 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" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 | 35 |
| 36 InitializeResourceBundle(); | 36 InitializeResourceBundle(); |
| 37 } | 37 } |
| 38 | 38 |
| 39 void ShellMainDelegate::SandboxInitialized(const std::string& process_type) { | 39 void ShellMainDelegate::SandboxInitialized(const std::string& process_type) { |
| 40 } | 40 } |
| 41 | 41 |
| 42 int ShellMainDelegate::RunProcess( | 42 int ShellMainDelegate::RunProcess( |
| 43 const std::string& process_type, | 43 const std::string& process_type, |
| 44 const content::MainFunctionParams& main_function_params) { | 44 const content::MainFunctionParams& main_function_params) { |
| 45 NOTREACHED(); | |
| 46 return -1; | 45 return -1; |
| 47 } | 46 } |
| 48 | 47 |
| 49 void ShellMainDelegate::ProcessExiting(const std::string& process_type) { | 48 void ShellMainDelegate::ProcessExiting(const std::string& process_type) { |
| 50 } | 49 } |
| 51 | 50 |
| 52 #if defined(OS_MACOSX) | 51 #if defined(OS_MACOSX) |
| 53 bool ShellMainDelegate::ProcessRegistersWithSystemProcess( | 52 bool ShellMainDelegate::ProcessRegistersWithSystemProcess( |
| 54 const std::string& process_type) { | 53 const std::string& process_type) { |
| 55 return false; | 54 return false; |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 } | 93 } |
| 95 } | 94 } |
| 96 | 95 |
| 97 void ShellMainDelegate::InitializeResourceBundle() { | 96 void ShellMainDelegate::InitializeResourceBundle() { |
| 98 FilePath pak_dir; | 97 FilePath pak_dir; |
| 99 PathService::Get(base::DIR_MODULE, &pak_dir); | 98 PathService::Get(base::DIR_MODULE, &pak_dir); |
| 100 | 99 |
| 101 FilePath pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")); | 100 FilePath pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")); |
| 102 ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file); | 101 ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file); |
| 103 } | 102 } |
| OLD | NEW |