| 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> |
| (...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 734 system::InputDeviceSettings::Get()->InitTouchDevicesStatusFromLocalPrefs(); | 734 system::InputDeviceSettings::Get()->InitTouchDevicesStatusFromLocalPrefs(); |
| 735 | 735 |
| 736 // These are dependent on the ash::Shell singleton already having been | 736 // These are dependent on the ash::Shell singleton already having been |
| 737 // initialized. Consequently, these cannot be used when running as a mus | 737 // initialized. Consequently, these cannot be used when running as a mus |
| 738 // client. | 738 // client. |
| 739 // TODO(oshima): Remove ash dependency in LoginLockStateNotifier. | 739 // TODO(oshima): Remove ash dependency in LoginLockStateNotifier. |
| 740 // crbug.com/408832. | 740 // crbug.com/408832. |
| 741 login_lock_state_notifier_.reset(new LoginLockStateNotifier); | 741 login_lock_state_notifier_.reset(new LoginLockStateNotifier); |
| 742 data_promo_notification_.reset(new DataPromoNotification()); | 742 data_promo_notification_.reset(new DataPromoNotification()); |
| 743 | 743 |
| 744 // TODO(mash): Support EventRewriterController; see crbug.com/647781 |
| 744 keyboard_event_rewriters_.reset(new EventRewriterController()); | 745 keyboard_event_rewriters_.reset(new EventRewriterController()); |
| 745 keyboard_event_rewriters_->AddEventRewriter( | 746 keyboard_event_rewriters_->AddEventRewriter( |
| 746 std::unique_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); | 747 std::unique_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); |
| 747 keyboard_event_rewriters_->AddEventRewriter( | 748 keyboard_event_rewriters_->AddEventRewriter( |
| 748 std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); | 749 std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); |
| 749 keyboard_event_rewriters_->AddEventRewriter( | 750 keyboard_event_rewriters_->AddEventRewriter( |
| 750 std::unique_ptr<ui::EventRewriter>(new EventRewriter( | 751 std::unique_ptr<ui::EventRewriter>(new EventRewriter( |
| 751 ash::Shell::GetInstance()->sticky_keys_controller()))); | 752 ash::Shell::GetInstance()->sticky_keys_controller()))); |
| 752 keyboard_event_rewriters_->Init(); | 753 keyboard_event_rewriters_->Init(); |
| 753 } | 754 } |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 879 // Destroy DBus services immediately after threads are stopped. | 880 // Destroy DBus services immediately after threads are stopped. |
| 880 dbus_services_.reset(); | 881 dbus_services_.reset(); |
| 881 | 882 |
| 882 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 883 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 883 | 884 |
| 884 // Destroy DeviceSettingsService after g_browser_process. | 885 // Destroy DeviceSettingsService after g_browser_process. |
| 885 DeviceSettingsService::Shutdown(); | 886 DeviceSettingsService::Shutdown(); |
| 886 } | 887 } |
| 887 | 888 |
| 888 } // namespace chromeos | 889 } // namespace chromeos |
| OLD | NEW |