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 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
667 if (ui::ShouldDefaultToNaturalScroll()) { | 667 if (ui::ShouldDefaultToNaturalScroll()) { |
668 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 668 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
669 chromeos::switches::kNaturalScrollDefault); | 669 chromeos::switches::kNaturalScrollDefault); |
670 system::InputDeviceSettings::Get()->SetTapToClick(true); | 670 system::InputDeviceSettings::Get()->SetTapToClick(true); |
671 } | 671 } |
672 | 672 |
673 ChromeBrowserMainPartsLinux::PreBrowserStart(); | 673 ChromeBrowserMainPartsLinux::PreBrowserStart(); |
674 } | 674 } |
675 | 675 |
676 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { | 676 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { |
| 677 system::InputDeviceSettings::Get()->InitTouchDevicesStatusFromLocalPrefs(); |
| 678 |
677 // These are dependent on the ash::Shell singleton already having been | 679 // These are dependent on the ash::Shell singleton already having been |
678 // initialized. | 680 // initialized. |
679 // TODO(oshima): Remove ash dependency in PowerButtonObserver. | 681 // TODO(oshima): Remove ash dependency in PowerButtonObserver. |
680 // crbug.com/408832. | 682 // crbug.com/408832. |
681 power_button_observer_.reset(new PowerButtonObserver); | 683 power_button_observer_.reset(new PowerButtonObserver); |
682 data_promo_notification_.reset(new DataPromoNotification()); | 684 data_promo_notification_.reset(new DataPromoNotification()); |
683 | 685 |
684 keyboard_event_rewriters_.reset(new EventRewriterController()); | 686 keyboard_event_rewriters_.reset(new EventRewriterController()); |
685 keyboard_event_rewriters_->AddEventRewriter( | 687 keyboard_event_rewriters_->AddEventRewriter( |
686 scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); | 688 scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
806 // Destroy DBus services immediately after threads are stopped. | 808 // Destroy DBus services immediately after threads are stopped. |
807 dbus_services_.reset(); | 809 dbus_services_.reset(); |
808 | 810 |
809 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 811 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
810 | 812 |
811 // Destroy DeviceSettingsService after g_browser_process. | 813 // Destroy DeviceSettingsService after g_browser_process. |
812 DeviceSettingsService::Shutdown(); | 814 DeviceSettingsService::Shutdown(); |
813 } | 815 } |
814 | 816 |
815 } // namespace chromeos | 817 } // namespace chromeos |
OLD | NEW |