Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1412623006: Developer Feature: Add Debug Accelerators to Toggle Touchscreen/Touchpad On or Off (CrOS) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix actions.xml. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 if (ui::ShouldDefaultToNaturalScroll()) { 649 if (ui::ShouldDefaultToNaturalScroll()) {
650 base::CommandLine::ForCurrentProcess()->AppendSwitch( 650 base::CommandLine::ForCurrentProcess()->AppendSwitch(
651 chromeos::switches::kNaturalScrollDefault); 651 chromeos::switches::kNaturalScrollDefault);
652 system::InputDeviceSettings::Get()->SetTapToClick(true); 652 system::InputDeviceSettings::Get()->SetTapToClick(true);
653 } 653 }
654 654
655 ChromeBrowserMainPartsLinux::PreBrowserStart(); 655 ChromeBrowserMainPartsLinux::PreBrowserStart();
656 } 656 }
657 657
658 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { 658 void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
659 system::InputDeviceSettings::Get()->InitTouchDevicesStatusFromLocalPrefs();
660
659 // These are dependent on the ash::Shell singleton already having been 661 // These are dependent on the ash::Shell singleton already having been
660 // initialized. 662 // initialized.
661 // TODO(oshima): Remove ash dependency in PowerButtonObserver. 663 // TODO(oshima): Remove ash dependency in PowerButtonObserver.
662 // crbug.com/408832. 664 // crbug.com/408832.
663 power_button_observer_.reset(new PowerButtonObserver); 665 power_button_observer_.reset(new PowerButtonObserver);
664 data_promo_notification_.reset(new DataPromoNotification()); 666 data_promo_notification_.reset(new DataPromoNotification());
665 667
666 keyboard_event_rewriters_.reset(new EventRewriterController()); 668 keyboard_event_rewriters_.reset(new EventRewriterController());
667 keyboard_event_rewriters_->AddEventRewriter( 669 keyboard_event_rewriters_->AddEventRewriter(
668 scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); 670 scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 // Destroy DBus services immediately after threads are stopped. 790 // Destroy DBus services immediately after threads are stopped.
789 dbus_services_.reset(); 791 dbus_services_.reset();
790 792
791 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 793 ChromeBrowserMainPartsLinux::PostDestroyThreads();
792 794
793 // Destroy DeviceSettingsService after g_browser_process. 795 // Destroy DeviceSettingsService after g_browser_process.
794 DeviceSettingsService::Shutdown(); 796 DeviceSettingsService::Shutdown();
795 } 797 }
796 798
797 } // namespace chromeos 799 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698