| 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 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 741 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 741 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 742 chromeos::switches::kNaturalScrollDefault); | 742 chromeos::switches::kNaturalScrollDefault); |
| 743 system::InputDeviceSettings::Get()->SetTapToClick(true); | 743 system::InputDeviceSettings::Get()->SetTapToClick(true); |
| 744 } | 744 } |
| 745 | 745 |
| 746 ChromeBrowserMainPartsLinux::PreBrowserStart(); | 746 ChromeBrowserMainPartsLinux::PreBrowserStart(); |
| 747 } | 747 } |
| 748 | 748 |
| 749 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { | 749 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { |
| 750 if (!chrome::IsRunningInMash()) { | 750 if (!chrome::IsRunningInMash()) { |
| 751 system::InputDeviceSettings::Get()->InitTouchDevicesStatusFromLocalPrefs(); | |
| 752 | |
| 753 // These are dependent on the ash::Shell singleton already having been | 751 // These are dependent on the ash::Shell singleton already having been |
| 754 // initialized. Consequently, these cannot be used when running as a mus | 752 // initialized. Consequently, these cannot be used when running as a mus |
| 755 // client. | 753 // client. |
| 756 // TODO(oshima): Remove ash dependency in LoginLockStateNotifier. | 754 // TODO(oshima): Remove ash dependency in LoginLockStateNotifier. |
| 757 // crbug.com/408832. | 755 // crbug.com/408832. |
| 758 login_lock_state_notifier_.reset(new LoginLockStateNotifier); | 756 login_lock_state_notifier_.reset(new LoginLockStateNotifier); |
| 759 data_promo_notification_.reset(new DataPromoNotification()); | 757 data_promo_notification_.reset(new DataPromoNotification()); |
| 760 | 758 |
| 761 // TODO(mash): Support EventRewriterController; see crbug.com/647781 | 759 // TODO(mash): Support EventRewriterController; see crbug.com/647781 |
| 762 keyboard_event_rewriters_.reset(new EventRewriterController()); | 760 keyboard_event_rewriters_.reset(new EventRewriterController()); |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 900 // Destroy DBus services immediately after threads are stopped. | 898 // Destroy DBus services immediately after threads are stopped. |
| 901 dbus_services_.reset(); | 899 dbus_services_.reset(); |
| 902 | 900 |
| 903 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 901 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 904 | 902 |
| 905 // Destroy DeviceSettingsService after g_browser_process. | 903 // Destroy DeviceSettingsService after g_browser_process. |
| 906 DeviceSettingsService::Shutdown(); | 904 DeviceSettingsService::Shutdown(); |
| 907 } | 905 } |
| 908 | 906 |
| 909 } // namespace chromeos | 907 } // namespace chromeos |
| OLD | NEW |