| 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 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 746 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 746 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 747 chromeos::switches::kNaturalScrollDefault); | 747 chromeos::switches::kNaturalScrollDefault); |
| 748 system::InputDeviceSettings::Get()->SetTapToClick(true); | 748 system::InputDeviceSettings::Get()->SetTapToClick(true); |
| 749 } | 749 } |
| 750 | 750 |
| 751 ChromeBrowserMainPartsLinux::PreBrowserStart(); | 751 ChromeBrowserMainPartsLinux::PreBrowserStart(); |
| 752 } | 752 } |
| 753 | 753 |
| 754 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { | 754 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { |
| 755 if (!chrome::IsRunningInMash()) { | 755 if (!chrome::IsRunningInMash()) { |
| 756 system::InputDeviceSettings::Get()->UpdateTouchDevicesStatusFromPrefs(); |
| 757 |
| 756 // These are dependent on the ash::Shell singleton already having been | 758 // These are dependent on the ash::Shell singleton already having been |
| 757 // initialized. Consequently, these cannot be used when running as a mus | 759 // initialized. Consequently, these cannot be used when running as a mus |
| 758 // client. | 760 // client. |
| 759 // TODO(oshima): Remove ash dependency in LoginLockStateNotifier. | 761 // TODO(oshima): Remove ash dependency in LoginLockStateNotifier. |
| 760 // crbug.com/408832. | 762 // crbug.com/408832. |
| 761 login_lock_state_notifier_.reset(new LoginLockStateNotifier); | 763 login_lock_state_notifier_.reset(new LoginLockStateNotifier); |
| 762 data_promo_notification_.reset(new DataPromoNotification()); | 764 data_promo_notification_.reset(new DataPromoNotification()); |
| 763 | 765 |
| 764 // TODO(mash): Support EventRewriterController; see crbug.com/647781 | 766 // TODO(mash): Support EventRewriterController; see crbug.com/647781 |
| 765 keyboard_event_rewriters_.reset(new EventRewriterController()); | 767 keyboard_event_rewriters_.reset(new EventRewriterController()); |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 // Destroy DBus services immediately after threads are stopped. | 915 // Destroy DBus services immediately after threads are stopped. |
| 914 dbus_services_.reset(); | 916 dbus_services_.reset(); |
| 915 | 917 |
| 916 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 918 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 917 | 919 |
| 918 // Destroy DeviceSettingsService after g_browser_process. | 920 // Destroy DeviceSettingsService after g_browser_process. |
| 919 DeviceSettingsService::Shutdown(); | 921 DeviceSettingsService::Shutdown(); |
| 920 } | 922 } |
| 921 | 923 |
| 922 } // namespace chromeos | 924 } // namespace chromeos |
| OLD | NEW |