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/accessibility_util.h" |
20 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 21 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
21 #include "chrome/browser/chromeos/audio/audio_handler.h" | 22 #include "chrome/browser/chromeos/audio/audio_handler.h" |
22 #include "chrome/browser/chromeos/boot_times_loader.h" | 23 #include "chrome/browser/chromeos/boot_times_loader.h" |
23 #include "chrome/browser/chromeos/contacts/contact_manager.h" | 24 #include "chrome/browser/chromeos/contacts/contact_manager.h" |
24 #include "chrome/browser/chromeos/cros/cros_library.h" | 25 #include "chrome/browser/chromeos/cros/cros_library.h" |
25 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" | 26 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" |
26 #include "chrome/browser/chromeos/display/display_preferences.h" | 27 #include "chrome/browser/chromeos/display/display_preferences.h" |
27 #include "chrome/browser/chromeos/display/primary_display_switch_observer.h" | 28 #include "chrome/browser/chromeos/display/primary_display_switch_observer.h" |
28 #include "chrome/browser/chromeos/external_metrics.h" | 29 #include "chrome/browser/chromeos/external_metrics.h" |
29 #include "chrome/browser/chromeos/extensions/default_app_order.h" | 30 #include "chrome/browser/chromeos/extensions/default_app_order.h" |
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
521 brightness_observer_.reset(new BrightnessObserver()); | 522 brightness_observer_.reset(new BrightnessObserver()); |
522 output_observer_.reset(new OutputObserver()); | 523 output_observer_.reset(new OutputObserver()); |
523 resume_observer_.reset(new ResumeObserver()); | 524 resume_observer_.reset(new ResumeObserver()); |
524 screen_lock_observer_.reset(new ScreenLockObserver()); | 525 screen_lock_observer_.reset(new ScreenLockObserver()); |
525 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { | 526 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { |
526 power_state_override_ = new PowerStateOverride( | 527 power_state_override_ = new PowerStateOverride( |
527 PowerStateOverride::BLOCK_DISPLAY_SLEEP); | 528 PowerStateOverride::BLOCK_DISPLAY_SLEEP); |
528 } | 529 } |
529 magnification_manager_.reset( | 530 magnification_manager_.reset( |
530 chromeos::MagnificationManager::CreateInstance()); | 531 chromeos::MagnificationManager::CreateInstance()); |
| 532 chromeos::accessibility::Initialize(); |
531 | 533 |
532 primary_display_switch_observer_.reset( | 534 primary_display_switch_observer_.reset( |
533 new PrimaryDisplaySwitchObserver()); | 535 new PrimaryDisplaySwitchObserver()); |
534 | 536 |
535 removable_device_notifications_ = | 537 removable_device_notifications_ = |
536 new RemovableDeviceNotificationsCros(); | 538 new RemovableDeviceNotificationsCros(); |
537 | 539 |
538 // Initialize the network portal detector for Chrome OS. The network | 540 // Initialize the network portal detector for Chrome OS. The network |
539 // portal detector starts to listen for notifications from | 541 // portal detector starts to listen for notifications from |
540 // NetworkLibrary about changes in the NetworkManager and initiates | 542 // NetworkLibrary about changes in the NetworkManager and initiates |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
700 } else if (trial->group() == margin_200mb) { | 702 } else if (trial->group() == margin_200mb) { |
701 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; | 703 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; |
702 LowMemoryObserver::SetLowMemoryMargin(200); | 704 LowMemoryObserver::SetLowMemoryMargin(200); |
703 } else { | 705 } else { |
704 LOG(WARNING) << "low_mem: Part of 'default' experiment"; | 706 LOG(WARNING) << "low_mem: Part of 'default' experiment"; |
705 } | 707 } |
706 } | 708 } |
707 } | 709 } |
708 | 710 |
709 } // namespace chromeos | 711 } // namespace chromeos |
OLD | NEW |