| 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 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 731 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 732 chromeos::switches::kNaturalScrollDefault); | 732 chromeos::switches::kNaturalScrollDefault); |
| 733 system::InputDeviceSettings::Get()->SetTapToClick(true); | 733 system::InputDeviceSettings::Get()->SetTapToClick(true); |
| 734 } | 734 } |
| 735 | 735 |
| 736 ChromeBrowserMainPartsLinux::PreBrowserStart(); | 736 ChromeBrowserMainPartsLinux::PreBrowserStart(); |
| 737 } | 737 } |
| 738 | 738 |
| 739 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { | 739 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { |
| 740 if (!chrome::IsRunningInMash()) { | 740 if (!chrome::IsRunningInMash()) { |
| 741 system::InputDeviceSettings::Get()->InitTouchDevicesStatusFromLocalPrefs(); | |
| 742 | |
| 743 // These are dependent on the ash::Shell singleton already having been | 741 // These are dependent on the ash::Shell singleton already having been |
| 744 // initialized. Consequently, these cannot be used when running as a mus | 742 // initialized. Consequently, these cannot be used when running as a mus |
| 745 // client. | 743 // client. |
| 746 // TODO(oshima): Remove ash dependency in LoginLockStateNotifier. | 744 // TODO(oshima): Remove ash dependency in LoginLockStateNotifier. |
| 747 // crbug.com/408832. | 745 // crbug.com/408832. |
| 748 login_lock_state_notifier_.reset(new LoginLockStateNotifier); | 746 login_lock_state_notifier_.reset(new LoginLockStateNotifier); |
| 749 data_promo_notification_.reset(new DataPromoNotification()); | 747 data_promo_notification_.reset(new DataPromoNotification()); |
| 750 | 748 |
| 751 // TODO(mash): Support EventRewriterController; see crbug.com/647781 | 749 // TODO(mash): Support EventRewriterController; see crbug.com/647781 |
| 752 keyboard_event_rewriters_.reset(new EventRewriterController()); | 750 keyboard_event_rewriters_.reset(new EventRewriterController()); |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 887 // Destroy DBus services immediately after threads are stopped. | 885 // Destroy DBus services immediately after threads are stopped. |
| 888 dbus_services_.reset(); | 886 dbus_services_.reset(); |
| 889 | 887 |
| 890 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 888 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 891 | 889 |
| 892 // Destroy DeviceSettingsService after g_browser_process. | 890 // Destroy DeviceSettingsService after g_browser_process. |
| 893 DeviceSettingsService::Shutdown(); | 891 DeviceSettingsService::Shutdown(); |
| 894 } | 892 } |
| 895 | 893 |
| 896 } // namespace chromeos | 894 } // namespace chromeos |
| OLD | NEW |