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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 #endif | 637 #endif |
638 | 638 |
639 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 639 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
640 // -- immediately after ChildProcess::WaitForDebugger(). | 640 // -- immediately after ChildProcess::WaitForDebugger(). |
641 | 641 |
642 // Start the out-of-memory priority manager here so that we give the most | 642 // Start the out-of-memory priority manager here so that we give the most |
643 // amount of time for the other services to start up before we start | 643 // amount of time for the other services to start up before we start |
644 // adjusting the oom priority. | 644 // adjusting the oom priority. |
645 g_browser_process->platform_part()->oom_priority_manager()->Start(); | 645 g_browser_process->platform_part()->oom_priority_manager()->Start(); |
646 | 646 |
647 if (ui::ShouldDefaultToNaturalScroll()) | 647 if (ui::ShouldDefaultToNaturalScroll()) { |
| 648 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 649 chromeos::switches::kNaturalScrollDefault); |
648 ui::SetNaturalScroll(true); | 650 ui::SetNaturalScroll(true); |
| 651 } |
649 | 652 |
650 ChromeBrowserMainPartsLinux::PreBrowserStart(); | 653 ChromeBrowserMainPartsLinux::PreBrowserStart(); |
651 } | 654 } |
652 | 655 |
653 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { | 656 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { |
654 // These are dependent on the ash::Shell singleton already having been | 657 // These are dependent on the ash::Shell singleton already having been |
655 // initialized. | 658 // initialized. |
656 power_button_observer_.reset(new PowerButtonObserver); | 659 power_button_observer_.reset(new PowerButtonObserver); |
657 data_promo_notification_.reset(new DataPromoNotification()), | 660 data_promo_notification_.reset(new DataPromoNotification()), |
658 | 661 |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
762 | 765 |
763 // Destroy DeviceSettingsService after g_browser_process. | 766 // Destroy DeviceSettingsService after g_browser_process. |
764 DeviceSettingsService::Shutdown(); | 767 DeviceSettingsService::Shutdown(); |
765 } | 768 } |
766 | 769 |
767 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { | 770 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { |
768 default_pinned_apps_field_trial::SetupTrial(); | 771 default_pinned_apps_field_trial::SetupTrial(); |
769 } | 772 } |
770 | 773 |
771 } // namespace chromeos | 774 } // namespace chromeos |
OLD | NEW |