| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/shell/app/shell_main_delegate.h" | 5 #include "extensions/shell/app/shell_main_delegate.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 #endif | 92 #endif |
| 93 #if !defined(DISABLE_NACL) && defined(OS_LINUX) | 93 #if !defined(DISABLE_NACL) && defined(OS_LINUX) |
| 94 nacl::RegisterPathProvider(); | 94 nacl::RegisterPathProvider(); |
| 95 #endif | 95 #endif |
| 96 extensions::RegisterPathProvider(); | 96 extensions::RegisterPathProvider(); |
| 97 return false; | 97 return false; |
| 98 } | 98 } |
| 99 | 99 |
| 100 void ShellMainDelegate::PreSandboxStartup() { | 100 void ShellMainDelegate::PreSandboxStartup() { |
| 101 std::string process_type = | 101 std::string process_type = |
| 102 CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 102 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
| 103 switches::kProcessType); | 103 switches::kProcessType); |
| 104 if (ProcessNeedsResourceBundle(process_type)) | 104 if (ProcessNeedsResourceBundle(process_type)) |
| 105 InitializeResourceBundle(); | 105 InitializeResourceBundle(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { | 108 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { |
| 109 browser_client_.reset(CreateShellContentBrowserClient()); | 109 browser_client_.reset(CreateShellContentBrowserClient()); |
| 110 return browser_client_.get(); | 110 return browser_client_.get(); |
| 111 } | 111 } |
| 112 | 112 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 #if !defined(DISABLE_NACL) | 165 #if !defined(DISABLE_NACL) |
| 166 process_type == switches::kNaClLoaderProcess || | 166 process_type == switches::kNaClLoaderProcess || |
| 167 #endif | 167 #endif |
| 168 #if defined(OS_MACOSX) | 168 #if defined(OS_MACOSX) |
| 169 process_type == switches::kGpuProcess || | 169 process_type == switches::kGpuProcess || |
| 170 #endif | 170 #endif |
| 171 process_type == switches::kUtilityProcess; | 171 process_type == switches::kUtilityProcess; |
| 172 } | 172 } |
| 173 | 173 |
| 174 } // namespace extensions | 174 } // namespace extensions |
| OLD | NEW |