| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 #endif | 44 #endif |
| 45 | 45 |
| 46 #if defined(OS_CHROMEOS) | 46 #if defined(OS_CHROMEOS) |
| 47 #include "chromeos/audio/cras_audio_handler.h" | 47 #include "chromeos/audio/cras_audio_handler.h" |
| 48 #include "chromeos/dbus/dbus_thread_manager.h" | 48 #include "chromeos/dbus/dbus_thread_manager.h" |
| 49 #include "chromeos/network/network_handler.h" | 49 #include "chromeos/network/network_handler.h" |
| 50 #include "extensions/shell/browser/shell_audio_controller_chromeos.h" | 50 #include "extensions/shell/browser/shell_audio_controller_chromeos.h" |
| 51 #include "extensions/shell/browser/shell_network_controller_chromeos.h" | 51 #include "extensions/shell/browser/shell_network_controller_chromeos.h" |
| 52 #endif | 52 #endif |
| 53 | 53 |
| 54 #if defined(OS_MACOSX) |
| 55 #include "extensions/shell/browser/shell_browser_main_parts_mac.h" |
| 56 #endif |
| 57 |
| 54 #if !defined(DISABLE_NACL) | 58 #if !defined(DISABLE_NACL) |
| 55 #include "components/nacl/browser/nacl_browser.h" | 59 #include "components/nacl/browser/nacl_browser.h" |
| 56 #include "components/nacl/browser/nacl_process_host.h" | 60 #include "components/nacl/browser/nacl_process_host.h" |
| 57 #include "content/public/browser/browser_thread.h" | 61 #include "content/public/browser/browser_thread.h" |
| 58 #include "extensions/shell/browser/shell_nacl_browser_delegate.h" | 62 #include "extensions/shell/browser/shell_nacl_browser_delegate.h" |
| 59 #endif | 63 #endif |
| 60 | 64 |
| 61 using base::CommandLine; | 65 using base::CommandLine; |
| 62 using content::BrowserContext; | 66 using content::BrowserContext; |
| 63 | 67 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 83 run_message_loop_(true), | 87 run_message_loop_(true), |
| 84 browser_main_delegate_(browser_main_delegate) { | 88 browser_main_delegate_(browser_main_delegate) { |
| 85 } | 89 } |
| 86 | 90 |
| 87 ShellBrowserMainParts::~ShellBrowserMainParts() { | 91 ShellBrowserMainParts::~ShellBrowserMainParts() { |
| 88 DCHECK(!devtools_http_handler_); | 92 DCHECK(!devtools_http_handler_); |
| 89 } | 93 } |
| 90 | 94 |
| 91 void ShellBrowserMainParts::PreMainMessageLoopStart() { | 95 void ShellBrowserMainParts::PreMainMessageLoopStart() { |
| 92 // TODO(jamescook): Initialize touch here? | 96 // TODO(jamescook): Initialize touch here? |
| 97 #if defined(OS_MACOSX) |
| 98 MainPartsPreMainMessageLoopStartMac(); |
| 99 #endif |
| 93 } | 100 } |
| 94 | 101 |
| 95 void ShellBrowserMainParts::PostMainMessageLoopStart() { | 102 void ShellBrowserMainParts::PostMainMessageLoopStart() { |
| 96 #if defined(OS_CHROMEOS) | 103 #if defined(OS_CHROMEOS) |
| 97 // Perform initialization of D-Bus objects here rather than in the below | 104 // Perform initialization of D-Bus objects here rather than in the below |
| 98 // helper classes so those classes' tests can initialize stub versions of the | 105 // helper classes so those classes' tests can initialize stub versions of the |
| 99 // D-Bus objects. | 106 // D-Bus objects. |
| 100 chromeos::DBusThreadManager::Initialize(); | 107 chromeos::DBusThreadManager::Initialize(); |
| 101 | 108 |
| 102 chromeos::NetworkHandler::Initialize(); | 109 chromeos::NetworkHandler::Initialize(); |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 } | 276 } |
| 270 | 277 |
| 271 void ShellBrowserMainParts::CreateExtensionSystem() { | 278 void ShellBrowserMainParts::CreateExtensionSystem() { |
| 272 DCHECK(browser_context_); | 279 DCHECK(browser_context_); |
| 273 extension_system_ = static_cast<ShellExtensionSystem*>( | 280 extension_system_ = static_cast<ShellExtensionSystem*>( |
| 274 ExtensionSystem::Get(browser_context_.get())); | 281 ExtensionSystem::Get(browser_context_.get())); |
| 275 extension_system_->InitForRegularProfile(true); | 282 extension_system_->InitForRegularProfile(true); |
| 276 } | 283 } |
| 277 | 284 |
| 278 } // namespace extensions | 285 } // namespace extensions |
| OLD | NEW |