OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
| 14 #include "ash/sticky_keys/sticky_keys_controller.h" |
14 #include "base/bind.h" | 15 #include "base/bind.h" |
15 #include "base/callback.h" | 16 #include "base/callback.h" |
16 #include "base/command_line.h" | 17 #include "base/command_line.h" |
17 #include "base/files/file_util.h" | 18 #include "base/files/file_util.h" |
18 #include "base/lazy_instance.h" | 19 #include "base/lazy_instance.h" |
19 #include "base/linux_util.h" | 20 #include "base/linux_util.h" |
20 #include "base/macros.h" | 21 #include "base/macros.h" |
21 #include "base/memory/ptr_util.h" | 22 #include "base/memory/ptr_util.h" |
22 #include "base/path_service.h" | 23 #include "base/path_service.h" |
23 #include "base/strings/string_number_conversions.h" | 24 #include "base/strings/string_number_conversions.h" |
(...skipping 12 matching lines...) Expand all Loading... |
36 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification
.h" | 37 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification
.h" |
37 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" | 38 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" |
38 #include "chrome/browser/chromeos/boot_times_recorder.h" | 39 #include "chrome/browser/chromeos/boot_times_recorder.h" |
39 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.
h" | 40 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.
h" |
40 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del
egate.h" | 41 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del
egate.h" |
41 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" | 42 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" |
42 #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h" | 43 #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h" |
43 #include "chrome/browser/chromeos/dbus/mus_console_service_provider_delegate.h" | 44 #include "chrome/browser/chromeos/dbus/mus_console_service_provider_delegate.h" |
44 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" | 45 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" |
45 #include "chrome/browser/chromeos/display/quirks_manager_delegate_impl.h" | 46 #include "chrome/browser/chromeos/display/quirks_manager_delegate_impl.h" |
46 #include "chrome/browser/chromeos/events/event_rewriter.h" | |
47 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" | 47 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" |
| 48 #include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h" |
48 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" | 49 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" |
49 #include "chrome/browser/chromeos/extensions/default_app_order.h" | 50 #include "chrome/browser/chromeos/extensions/default_app_order.h" |
50 #include "chrome/browser/chromeos/extensions/extension_volume_observer.h" | 51 #include "chrome/browser/chromeos/extensions/extension_volume_observer.h" |
51 #include "chrome/browser/chromeos/external_metrics.h" | 52 #include "chrome/browser/chromeos/external_metrics.h" |
52 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 53 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
53 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 54 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
54 #include "chrome/browser/chromeos/language_preferences.h" | 55 #include "chrome/browser/chromeos/language_preferences.h" |
55 #include "chrome/browser/chromeos/libc_close_tracking.h" | 56 #include "chrome/browser/chromeos/libc_close_tracking.h" |
56 #include "chrome/browser/chromeos/login/helper.h" | 57 #include "chrome/browser/chromeos/login/helper.h" |
57 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 58 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 #include "media/audio/sounds/sounds_manager.h" | 152 #include "media/audio/sounds/sounds_manager.h" |
152 #include "net/base/network_change_notifier.h" | 153 #include "net/base/network_change_notifier.h" |
153 #include "net/url_request/url_request.h" | 154 #include "net/url_request/url_request.h" |
154 #include "net/url_request/url_request_context_getter.h" | 155 #include "net/url_request/url_request_context_getter.h" |
155 #include "printing/backend/print_backend.h" | 156 #include "printing/backend/print_backend.h" |
156 #include "rlz/features/features.h" | 157 #include "rlz/features/features.h" |
157 #include "third_party/cros_system_api/dbus/service_constants.h" | 158 #include "third_party/cros_system_api/dbus/service_constants.h" |
158 #include "ui/base/ime/chromeos/ime_keyboard.h" | 159 #include "ui/base/ime/chromeos/ime_keyboard.h" |
159 #include "ui/base/ime/chromeos/input_method_manager.h" | 160 #include "ui/base/ime/chromeos/input_method_manager.h" |
160 #include "ui/base/touch/touch_device.h" | 161 #include "ui/base/touch/touch_device.h" |
| 162 #include "ui/chromeos/events/event_rewriter.h" |
| 163 #include "ui/chromeos/pref_names.h" |
161 #include "ui/events/event_utils.h" | 164 #include "ui/events/event_utils.h" |
162 | 165 |
163 #if BUILDFLAG(ENABLE_RLZ) | 166 #if BUILDFLAG(ENABLE_RLZ) |
164 #include "components/rlz/rlz_tracker.h" | 167 #include "components/rlz/rlz_tracker.h" |
165 #endif | 168 #endif |
166 | 169 |
167 // Exclude X11 dependents for ozone | 170 // Exclude X11 dependents for ozone |
168 #if defined(USE_X11) | 171 #if defined(USE_X11) |
169 #include "chrome/browser/chromeos/device_uma.h" | 172 #include "chrome/browser/chromeos/device_uma.h" |
170 #include "chrome/browser/chromeos/events/system_key_event_listener.h" | 173 #include "chrome/browser/chromeos/events/system_key_event_listener.h" |
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
797 // crbug.com/408832. | 800 // crbug.com/408832. |
798 login_lock_state_notifier_.reset(new LoginLockStateNotifier); | 801 login_lock_state_notifier_.reset(new LoginLockStateNotifier); |
799 data_promo_notification_.reset(new DataPromoNotification()); | 802 data_promo_notification_.reset(new DataPromoNotification()); |
800 | 803 |
801 // TODO(mash): Support EventRewriterController; see crbug.com/647781 | 804 // TODO(mash): Support EventRewriterController; see crbug.com/647781 |
802 keyboard_event_rewriters_.reset(new EventRewriterController()); | 805 keyboard_event_rewriters_.reset(new EventRewriterController()); |
803 keyboard_event_rewriters_->AddEventRewriter( | 806 keyboard_event_rewriters_->AddEventRewriter( |
804 std::unique_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); | 807 std::unique_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); |
805 keyboard_event_rewriters_->AddEventRewriter( | 808 keyboard_event_rewriters_->AddEventRewriter( |
806 std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); | 809 std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); |
| 810 event_rewriter_delegate_ = base::MakeUnique<EventRewriterDelegateImpl>(); |
807 keyboard_event_rewriters_->AddEventRewriter( | 811 keyboard_event_rewriters_->AddEventRewriter( |
808 std::unique_ptr<ui::EventRewriter>(new EventRewriter( | 812 base::MakeUnique<ui::chromeos::EventRewriter>( |
809 ash::Shell::GetInstance()->sticky_keys_controller()))); | 813 event_rewriter_delegate_.get(), |
| 814 ash::Shell::GetInstance()->sticky_keys_controller())); |
810 keyboard_event_rewriters_->Init(); | 815 keyboard_event_rewriters_->Init(); |
811 } | 816 } |
812 | 817 |
813 // In classic ash must occur after ash::WmShell is initialized. Triggers a | 818 // In classic ash must occur after ash::WmShell is initialized. Triggers a |
814 // fetch of the initial CrosSettings DeviceRebootOnShutdown policy. | 819 // fetch of the initial CrosSettings DeviceRebootOnShutdown policy. |
815 shutdown_policy_forwarder_ = base::MakeUnique<ShutdownPolicyForwarder>(); | 820 shutdown_policy_forwarder_ = base::MakeUnique<ShutdownPolicyForwarder>(); |
816 | 821 |
817 ChromeBrowserMainPartsLinux::PostBrowserStart(); | 822 ChromeBrowserMainPartsLinux::PostBrowserStart(); |
818 } | 823 } |
819 | 824 |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
957 | 962 |
958 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 963 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
959 | 964 |
960 // Destroy DeviceSettingsService after g_browser_process. | 965 // Destroy DeviceSettingsService after g_browser_process. |
961 DeviceSettingsService::Shutdown(); | 966 DeviceSettingsService::Shutdown(); |
962 | 967 |
963 chromeos::ShutdownCloseTracking(); | 968 chromeos::ShutdownCloseTracking(); |
964 } | 969 } |
965 | 970 |
966 } // namespace chromeos | 971 } // namespace chromeos |
OLD | NEW |