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

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

Issue 11778025: Decouple loading of channel info and the rest of machine statistics. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add more comments, DCHECK. Created 7 years, 11 months 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 | Annotate | Revision Log
OLDNEW
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 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 618
619 // Start the out-of-memory priority manager here so that we give the most 619 // Start the out-of-memory priority manager here so that we give the most
620 // amount of time for the other services to start up before we start 620 // amount of time for the other services to start up before we start
621 // adjusting the oom priority. 621 // adjusting the oom priority.
622 g_browser_process->oom_priority_manager()->Start(); 622 g_browser_process->oom_priority_manager()->Start();
623 623
624 ChromeBrowserMainPartsLinux::PreBrowserStart(); 624 ChromeBrowserMainPartsLinux::PreBrowserStart();
625 } 625 }
626 626
627 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { 627 void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
628 // Start loading the machine statistics. Note: if we start loading machine
629 // statistics early in PreEarlyInitialization() then the crossystem tool
630 // sometimes hangs for unknown reasons, see http://crbug.com/167671.
631 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics();
632
628 // These are dependent on the ash::Shell singleton already having been 633 // These are dependent on the ash::Shell singleton already having been
629 // initialized. 634 // initialized.
630 power_button_observer_.reset(new PowerButtonObserver); 635 power_button_observer_.reset(new PowerButtonObserver);
631 user_activity_notifier_.reset(new UserActivityNotifier); 636 user_activity_notifier_.reset(new UserActivityNotifier);
632 video_activity_notifier_.reset(new VideoActivityNotifier); 637 video_activity_notifier_.reset(new VideoActivityNotifier);
633 screen_dimming_observer_.reset(new ScreenDimmingObserver); 638 screen_dimming_observer_.reset(new ScreenDimmingObserver);
634 639
635 ChromeBrowserMainPartsLinux::PostBrowserStart(); 640 ChromeBrowserMainPartsLinux::PostBrowserStart();
636 } 641 }
637 642
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 } else if (trial->group() == margin_200mb) { 759 } else if (trial->group() == margin_200mb) {
755 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 760 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
756 LowMemoryObserver::SetLowMemoryMargin(200); 761 LowMemoryObserver::SetLowMemoryMargin(200);
757 } else { 762 } else {
758 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 763 LOG(WARNING) << "low_mem: Part of 'default' experiment";
759 } 764 }
760 } 765 }
761 } 766 }
762 767
763 } // namespace chromeos 768 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698