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 <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
658 if (ui::ShouldDefaultToNaturalScroll()) { | 658 if (ui::ShouldDefaultToNaturalScroll()) { |
659 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 659 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
660 chromeos::switches::kNaturalScrollDefault); | 660 chromeos::switches::kNaturalScrollDefault); |
661 system::InputDeviceSettings::Get()->SetTapToClick(true); | 661 system::InputDeviceSettings::Get()->SetTapToClick(true); |
662 } | 662 } |
663 | 663 |
664 ChromeBrowserMainPartsLinux::PreBrowserStart(); | 664 ChromeBrowserMainPartsLinux::PreBrowserStart(); |
665 } | 665 } |
666 | 666 |
667 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { | 667 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { |
| 668 system::InputDeviceSettings::Get()->InitTouchDevicesStatusFromLocalPrefs(); |
| 669 |
668 // These are dependent on the ash::Shell singleton already having been | 670 // These are dependent on the ash::Shell singleton already having been |
669 // initialized. | 671 // initialized. |
670 // TODO(oshima): Remove ash dependency in PowerButtonObserver. | 672 // TODO(oshima): Remove ash dependency in PowerButtonObserver. |
671 // crbug.com/408832. | 673 // crbug.com/408832. |
672 power_button_observer_.reset(new PowerButtonObserver); | 674 power_button_observer_.reset(new PowerButtonObserver); |
673 data_promo_notification_.reset(new DataPromoNotification()); | 675 data_promo_notification_.reset(new DataPromoNotification()); |
674 | 676 |
675 keyboard_event_rewriters_.reset(new EventRewriterController()); | 677 keyboard_event_rewriters_.reset(new EventRewriterController()); |
676 keyboard_event_rewriters_->AddEventRewriter( | 678 keyboard_event_rewriters_->AddEventRewriter( |
677 scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); | 679 scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
797 // Destroy DBus services immediately after threads are stopped. | 799 // Destroy DBus services immediately after threads are stopped. |
798 dbus_services_.reset(); | 800 dbus_services_.reset(); |
799 | 801 |
800 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 802 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
801 | 803 |
802 // Destroy DeviceSettingsService after g_browser_process. | 804 // Destroy DeviceSettingsService after g_browser_process. |
803 DeviceSettingsService::Shutdown(); | 805 DeviceSettingsService::Shutdown(); |
804 } | 806 } |
805 | 807 |
806 } // namespace chromeos | 808 } // namespace chromeos |
OLD | NEW |