| 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 "chrome/browser/chromeos/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" | 29 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" |
| 30 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 30 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| 31 #include "chrome/browser/chromeos/login/authenticator.h" | 31 #include "chrome/browser/chromeos/login/authenticator.h" |
| 32 #include "chrome/browser/chromeos/login/login_utils.h" | 32 #include "chrome/browser/chromeos/login/login_utils.h" |
| 33 #include "chrome/browser/chromeos/login/login_wizard.h" | 33 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 34 #include "chrome/browser/chromeos/login/screen_locker.h" | 34 #include "chrome/browser/chromeos/login/screen_locker.h" |
| 35 #include "chrome/browser/chromeos/login/user_manager.h" | 35 #include "chrome/browser/chromeos/login/user_manager.h" |
| 36 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 36 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
| 37 #include "chrome/browser/chromeos/login/wizard_controller.h" | 37 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 38 #include "chrome/browser/chromeos/low_memory_observer.h" | 38 #include "chrome/browser/chromeos/low_memory_observer.h" |
| 39 #include "chrome/browser/chromeos/mtp/media_transfer_protocol_manager.h" |
| 39 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" | 40 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" |
| 40 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" | 41 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" |
| 41 #include "chrome/browser/chromeos/oom_priority_manager.h" | 42 #include "chrome/browser/chromeos/oom_priority_manager.h" |
| 42 #include "chrome/browser/chromeos/power/brightness_observer.h" | 43 #include "chrome/browser/chromeos/power/brightness_observer.h" |
| 43 #include "chrome/browser/chromeos/power/output_observer.h" | 44 #include "chrome/browser/chromeos/power/output_observer.h" |
| 44 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo
s.h" | 45 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo
s.h" |
| 45 #include "chrome/browser/chromeos/power/power_button_observer.h" | 46 #include "chrome/browser/chromeos/power/power_button_observer.h" |
| 46 #include "chrome/browser/chromeos/power/power_state_override.h" | 47 #include "chrome/browser/chromeos/power/power_state_override.h" |
| 47 #include "chrome/browser/chromeos/power/resume_observer.h" | 48 #include "chrome/browser/chromeos/power/resume_observer.h" |
| 48 #include "chrome/browser/chromeos/power/screen_dimming_observer.h" | 49 #include "chrome/browser/chromeos/power/screen_dimming_observer.h" |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 | 202 |
| 202 ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos( | 203 ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos( |
| 203 const content::MainFunctionParams& parameters) | 204 const content::MainFunctionParams& parameters) |
| 204 : ChromeBrowserMainPartsLinux(parameters) { | 205 : ChromeBrowserMainPartsLinux(parameters) { |
| 205 } | 206 } |
| 206 | 207 |
| 207 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() { | 208 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() { |
| 208 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) | 209 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) |
| 209 chromeos::ShutdownKioskModeScreensaver(); | 210 chromeos::ShutdownKioskModeScreensaver(); |
| 210 cryptohome::AsyncMethodCaller::Shutdown(); | 211 cryptohome::AsyncMethodCaller::Shutdown(); |
| 212 chromeos::mtp::MediaTransferProtocolManager::Shutdown(); |
| 211 chromeos::disks::DiskMountManager::Shutdown(); | 213 chromeos::disks::DiskMountManager::Shutdown(); |
| 212 | 214 |
| 213 // CrosLibrary is shut down before DBusThreadManager even though the former | 215 // CrosLibrary is shut down before DBusThreadManager even though the former |
| 214 // is initialized before the latter becuase some of its libraries depend | 216 // is initialized before the latter becuase some of its libraries depend |
| 215 // on DBus clients. | 217 // on DBus clients. |
| 216 // TODO(hashimoto): Resolve this situation by removing CrosLibrary. | 218 // TODO(hashimoto): Resolve this situation by removing CrosLibrary. |
| 217 // (crosbug.com/26160) | 219 // (crosbug.com/26160) |
| 218 if (!parameters().ui_task && chromeos::CrosLibrary::Get()) | 220 if (!parameters().ui_task && chromeos::CrosLibrary::Get()) |
| 219 chromeos::CrosLibrary::Shutdown(); | 221 chromeos::CrosLibrary::Shutdown(); |
| 220 | 222 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 // DBusThreadManager. | 292 // DBusThreadManager. |
| 291 chromeos::WallpaperManager::Get()->AddObservers(); | 293 chromeos::WallpaperManager::Get()->AddObservers(); |
| 292 | 294 |
| 293 chromeos::CrosDBusService::Initialize(); | 295 chromeos::CrosDBusService::Initialize(); |
| 294 | 296 |
| 295 // Initialize the session manager observer so that we'll take actions | 297 // Initialize the session manager observer so that we'll take actions |
| 296 // per signals sent from the session manager. | 298 // per signals sent from the session manager. |
| 297 session_manager_observer_.reset(new chromeos::SessionManagerObserver); | 299 session_manager_observer_.reset(new chromeos::SessionManagerObserver); |
| 298 | 300 |
| 299 chromeos::disks::DiskMountManager::Initialize(); | 301 chromeos::disks::DiskMountManager::Initialize(); |
| 302 chromeos::mtp::MediaTransferProtocolManager::Initialize(); |
| 300 cryptohome::AsyncMethodCaller::Initialize(); | 303 cryptohome::AsyncMethodCaller::Initialize(); |
| 301 | 304 |
| 302 // Initialize the network change notifier for Chrome OS. The network | 305 // Initialize the network change notifier for Chrome OS. The network |
| 303 // change notifier starts to monitor changes from the power manager and | 306 // change notifier starts to monitor changes from the power manager and |
| 304 // the network manager. | 307 // the network manager. |
| 305 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init(); | 308 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init(); |
| 306 | 309 |
| 307 // Likewise, initialize the upgrade detector for Chrome OS. The upgrade | 310 // Likewise, initialize the upgrade detector for Chrome OS. The upgrade |
| 308 // detector starts to monitor changes from the update engine. | 311 // detector starts to monitor changes from the update engine. |
| 309 UpgradeDetectorChromeos::GetInstance()->Init(); | 312 UpgradeDetectorChromeos::GetInstance()->Init(); |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 596 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; | 599 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; |
| 597 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); | 600 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); |
| 598 } else if (trial->group() == margin_200mb) { | 601 } else if (trial->group() == margin_200mb) { |
| 599 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; | 602 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; |
| 600 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); | 603 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); |
| 601 } else { | 604 } else { |
| 602 LOG(WARNING) << "low_mem: Part of 'default' experiment"; | 605 LOG(WARNING) << "low_mem: Part of 'default' experiment"; |
| 603 } | 606 } |
| 604 } | 607 } |
| 605 } | 608 } |
| OLD | NEW |