| 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/browser/shell_browser_main_parts.h" | 5 #include "extensions/shell/browser/shell_browser_main_parts.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 | 115 |
| 116 #else | 116 #else |
| 117 // Non-Chrome OS platforms are for developer convenience, so use a test IME. | 117 // Non-Chrome OS platforms are for developer convenience, so use a test IME. |
| 118 ui::InitializeInputMethodForTesting(); | 118 ui::InitializeInputMethodForTesting(); |
| 119 #endif | 119 #endif |
| 120 } | 120 } |
| 121 | 121 |
| 122 void ShellBrowserMainParts::PreEarlyInitialization() { | 122 void ShellBrowserMainParts::PreEarlyInitialization() { |
| 123 } | 123 } |
| 124 | 124 |
| 125 int ShellBrowserMainParts::PreCreateThreads() { | 125 int ShellBrowserMainParts::PreCreateThreadsBegin() { |
| 126 // TODO(jamescook): Initialize chromeos::CrosSettings here? | 126 // TODO(jamescook): Initialize chromeos::CrosSettings here? |
| 127 | 127 |
| 128 content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 128 content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 129 kExtensionScheme); | 129 kExtensionScheme); |
| 130 content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 130 content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 131 kExtensionResourceScheme); | 131 kExtensionResourceScheme); |
| 132 | 132 |
| 133 // Return no error. | 133 // Return no error. |
| 134 return 0; | 134 return 0; |
| 135 } | 135 } |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 } | 282 } |
| 283 | 283 |
| 284 void ShellBrowserMainParts::CreateExtensionSystem() { | 284 void ShellBrowserMainParts::CreateExtensionSystem() { |
| 285 DCHECK(browser_context_); | 285 DCHECK(browser_context_); |
| 286 extension_system_ = static_cast<ShellExtensionSystem*>( | 286 extension_system_ = static_cast<ShellExtensionSystem*>( |
| 287 ExtensionSystem::Get(browser_context_.get())); | 287 ExtensionSystem::Get(browser_context_.get())); |
| 288 extension_system_->InitForRegularProfile(true); | 288 extension_system_->InitForRegularProfile(true); |
| 289 } | 289 } |
| 290 | 290 |
| 291 } // namespace extensions | 291 } // namespace extensions |
| OLD | NEW |