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

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

Issue 14556015: [Media Galleries] Lazily initialize the storage monitor. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Test repair Created 7 years, 7 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
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 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 suspend_observer_.reset(new SuspendObserver()); 688 suspend_observer_.reset(new SuspendObserver());
689 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { 689 if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
690 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( 690 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create(
691 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, 691 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
692 "Retail mode"); 692 "Retail mode");
693 } 693 }
694 chromeos::accessibility::Initialize(); 694 chromeos::accessibility::Initialize();
695 695
696 peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); 696 peripheral_battery_observer_.reset(new PeripheralBatteryObserver());
697 697
698 storage_monitor_->Init();
699
700 // Initialize the network portal detector for Chrome OS. The network 698 // Initialize the network portal detector for Chrome OS. The network
701 // portal detector starts to listen for notifications from 699 // portal detector starts to listen for notifications from
702 // NetworkLibrary about changes in the NetworkManager and initiates 700 // NetworkLibrary about changes in the NetworkManager and initiates
703 // captive portal detection for active networks. 701 // captive portal detection for active networks.
704 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); 702 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
705 if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) { 703 if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) {
706 detector->Init(); 704 detector->Init();
707 #if defined(GOOGLE_CHROME_BUILD) 705 #if defined(GOOGLE_CHROME_BUILD)
708 bool is_official_build = true; 706 bool is_official_build = true;
709 #else 707 #else
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 902 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
905 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 903 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
906 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 904 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
907 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 905 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
908 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 906 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
909 // This is necessary to start the experiment as a side effect. 907 // This is necessary to start the experiment as a side effect.
910 trial->group(); 908 trial->group();
911 } 909 }
912 910
913 } // namespace chromeos 911 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698