OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shell.h" | 10 #include "ash/shell.h" |
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 video_activity_notifier_.reset(); | 646 video_activity_notifier_.reset(); |
647 primary_display_switch_observer_.reset(); | 647 primary_display_switch_observer_.reset(); |
648 | 648 |
649 // Detach D-Bus clients before DBusThreadManager is shut down. | 649 // Detach D-Bus clients before DBusThreadManager is shut down. |
650 power_button_observer_.reset(); | 650 power_button_observer_.reset(); |
651 screen_dimming_observer_.reset(); | 651 screen_dimming_observer_.reset(); |
652 | 652 |
653 // Delete ContactManager while |g_browser_process| is still alive. | 653 // Delete ContactManager while |g_browser_process| is still alive. |
654 contact_manager_.reset(); | 654 contact_manager_.reset(); |
655 | 655 |
656 // Let the UserManager unregister itself as an observer of the CrosSettings | |
657 // singleton before it is destroyed. | |
658 UserManager::Get()->Shutdown(); | |
659 | |
660 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun(); | 656 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun(); |
661 } | 657 } |
662 | 658 |
663 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { | 659 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { |
664 SetupLowMemoryHeadroomFieldTrial(); | 660 SetupLowMemoryHeadroomFieldTrial(); |
665 } | 661 } |
666 | 662 |
667 void ChromeBrowserMainPartsChromeos::SetupLowMemoryHeadroomFieldTrial() { | 663 void ChromeBrowserMainPartsChromeos::SetupLowMemoryHeadroomFieldTrial() { |
668 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); | 664 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
669 // Only enable this experiment on Canary and Dev, since it's possible | 665 // Only enable this experiment on Canary and Dev, since it's possible |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
704 } else if (trial->group() == margin_200mb) { | 700 } else if (trial->group() == margin_200mb) { |
705 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; | 701 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; |
706 LowMemoryObserver::SetLowMemoryMargin(200); | 702 LowMemoryObserver::SetLowMemoryMargin(200); |
707 } else { | 703 } else { |
708 LOG(WARNING) << "low_mem: Part of 'default' experiment"; | 704 LOG(WARNING) << "low_mem: Part of 'default' experiment"; |
709 } | 705 } |
710 } | 706 } |
711 } | 707 } |
712 | 708 |
713 } // namespace chromeos | 709 } // namespace chromeos |
OLD | NEW |