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 "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/callback.h" | 12 #include "base/callback.h" |
13 #include "base/chromeos/chromeos_version.h" | 13 #include "base/chromeos/chromeos_version.h" |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "base/lazy_instance.h" | 15 #include "base/lazy_instance.h" |
16 #include "base/message_loop.h" | 16 #include "base/message_loop.h" |
17 #include "base/string_number_conversions.h" | 17 #include "base/string_number_conversions.h" |
18 #include "base/string_split.h" | 18 #include "base/string_split.h" |
19 #include "chrome/browser/browser_process.h" | 19 #include "chrome/browser/browser_process.h" |
| 20 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
20 #include "chrome/browser/chromeos/audio/audio_handler.h" | 21 #include "chrome/browser/chromeos/audio/audio_handler.h" |
21 #include "chrome/browser/chromeos/boot_times_loader.h" | 22 #include "chrome/browser/chromeos/boot_times_loader.h" |
22 #include "chrome/browser/chromeos/contacts/contact_manager.h" | 23 #include "chrome/browser/chromeos/contacts/contact_manager.h" |
23 #include "chrome/browser/chromeos/cros/cros_library.h" | 24 #include "chrome/browser/chromeos/cros/cros_library.h" |
24 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" | 25 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" |
25 #include "chrome/browser/chromeos/display/display_preferences.h" | 26 #include "chrome/browser/chromeos/display/display_preferences.h" |
26 #include "chrome/browser/chromeos/display/primary_display_switch_observer.h" | 27 #include "chrome/browser/chromeos/display/primary_display_switch_observer.h" |
27 #include "chrome/browser/chromeos/external_metrics.h" | 28 #include "chrome/browser/chromeos/external_metrics.h" |
28 #include "chrome/browser/chromeos/extensions/default_app_order.h" | 29 #include "chrome/browser/chromeos/extensions/default_app_order.h" |
29 #include "chrome/browser/chromeos/imageburner/burn_manager.h" | 30 #include "chrome/browser/chromeos/imageburner/burn_manager.h" |
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
518 // Initialize the brightness observer so that we'll display an onscreen | 519 // Initialize the brightness observer so that we'll display an onscreen |
519 // indication of brightness changes during login. | 520 // indication of brightness changes during login. |
520 brightness_observer_.reset(new BrightnessObserver()); | 521 brightness_observer_.reset(new BrightnessObserver()); |
521 output_observer_.reset(new OutputObserver()); | 522 output_observer_.reset(new OutputObserver()); |
522 resume_observer_.reset(new ResumeObserver()); | 523 resume_observer_.reset(new ResumeObserver()); |
523 screen_lock_observer_.reset(new ScreenLockObserver()); | 524 screen_lock_observer_.reset(new ScreenLockObserver()); |
524 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { | 525 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { |
525 power_state_override_ = new PowerStateOverride( | 526 power_state_override_ = new PowerStateOverride( |
526 PowerStateOverride::BLOCK_DISPLAY_SLEEP); | 527 PowerStateOverride::BLOCK_DISPLAY_SLEEP); |
527 } | 528 } |
| 529 magnification_manager_.reset( |
| 530 chromeos::MagnificationManager::CreateInstance()); |
528 | 531 |
529 primary_display_switch_observer_.reset( | 532 primary_display_switch_observer_.reset( |
530 new PrimaryDisplaySwitchObserver()); | 533 new PrimaryDisplaySwitchObserver()); |
531 | 534 |
532 removable_device_notifications_ = | 535 removable_device_notifications_ = |
533 new RemovableDeviceNotificationsCros(); | 536 new RemovableDeviceNotificationsCros(); |
534 | 537 |
535 // Initialize the network portal detector for Chrome OS. The network | 538 // Initialize the network portal detector for Chrome OS. The network |
536 // portal detector starts to listen for notifications from | 539 // portal detector starts to listen for notifications from |
537 // NetworkLibrary about changes in the NetworkManager and initiates | 540 // NetworkLibrary about changes in the NetworkManager and initiates |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
615 | 618 |
616 // Tell DeviceSettingsService to stop talking to session_manager. | 619 // Tell DeviceSettingsService to stop talking to session_manager. |
617 DeviceSettingsService::Get()->Shutdown(); | 620 DeviceSettingsService::Get()->Shutdown(); |
618 | 621 |
619 // We should remove observers attached to D-Bus clients before | 622 // We should remove observers attached to D-Bus clients before |
620 // DBusThreadManager is shut down. | 623 // DBusThreadManager is shut down. |
621 screen_lock_observer_.reset(); | 624 screen_lock_observer_.reset(); |
622 resume_observer_.reset(); | 625 resume_observer_.reset(); |
623 brightness_observer_.reset(); | 626 brightness_observer_.reset(); |
624 output_observer_.reset(); | 627 output_observer_.reset(); |
| 628 magnification_manager_.reset(); |
625 power_state_override_ = NULL; | 629 power_state_override_ = NULL; |
626 | 630 |
627 // The XInput2 event listener needs to be shut down earlier than when | 631 // The XInput2 event listener needs to be shut down earlier than when |
628 // Singletons are finally destroyed in AtExitManager. | 632 // Singletons are finally destroyed in AtExitManager. |
629 XInputHierarchyChangedEventListener::GetInstance()->Stop(); | 633 XInputHierarchyChangedEventListener::GetInstance()->Stop(); |
630 | 634 |
631 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, | 635 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, |
632 // even if Initialize() wasn't called. | 636 // even if Initialize() wasn't called. |
633 SystemKeyEventListener::Shutdown(); | 637 SystemKeyEventListener::Shutdown(); |
634 imageburner::BurnManager::Shutdown(); | 638 imageburner::BurnManager::Shutdown(); |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
696 } else if (trial->group() == margin_200mb) { | 700 } else if (trial->group() == margin_200mb) { |
697 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; | 701 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; |
698 LowMemoryObserver::SetLowMemoryMargin(200); | 702 LowMemoryObserver::SetLowMemoryMargin(200); |
699 } else { | 703 } else { |
700 LOG(WARNING) << "low_mem: Part of 'default' experiment"; | 704 LOG(WARNING) << "low_mem: Part of 'default' experiment"; |
701 } | 705 } |
702 } | 706 } |
703 } | 707 } |
704 | 708 |
705 } // namespace chromeos | 709 } // namespace chromeos |
OLD | NEW |