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

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

Issue 12382005: Rename RemovableDeviceNotifications=>StorageMonitor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix some includes from recent merge. Created 7 years, 9 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/shell.h" 10 #include "ash/shell.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 69 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
70 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" 70 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
71 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 71 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
72 #include "chrome/browser/defaults.h" 72 #include "chrome/browser/defaults.h"
73 #include "chrome/browser/metrics/metrics_service.h" 73 #include "chrome/browser/metrics/metrics_service.h"
74 #include "chrome/browser/net/chrome_network_delegate.h" 74 #include "chrome/browser/net/chrome_network_delegate.h"
75 #include "chrome/browser/policy/browser_policy_connector.h" 75 #include "chrome/browser/policy/browser_policy_connector.h"
76 #include "chrome/browser/profiles/profile.h" 76 #include "chrome/browser/profiles/profile.h"
77 #include "chrome/browser/profiles/profile_manager.h" 77 #include "chrome/browser/profiles/profile_manager.h"
78 #include "chrome/browser/rlz/rlz.h" 78 #include "chrome/browser/rlz/rlz.h"
79 #include "chrome/browser/storage_monitor/removable_device_notifications_chromeos .h" 79 #include "chrome/browser/storage_monitor/storage_monitor_chromeos.h"
80 #include "chrome/common/chrome_notification_types.h" 80 #include "chrome/common/chrome_notification_types.h"
81 #include "chrome/common/chrome_switches.h" 81 #include "chrome/common/chrome_switches.h"
82 #include "chrome/common/chrome_version_info.h" 82 #include "chrome/common/chrome_version_info.h"
83 #include "chrome/common/logging_chrome.h" 83 #include "chrome/common/logging_chrome.h"
84 #include "chrome/common/pref_names.h" 84 #include "chrome/common/pref_names.h"
85 #include "chromeos/chromeos_switches.h" 85 #include "chromeos/chromeos_switches.h"
86 #include "chromeos/cryptohome/async_method_caller.h" 86 #include "chromeos/cryptohome/async_method_caller.h"
87 #include "chromeos/dbus/dbus_thread_manager.h" 87 #include "chromeos/dbus/dbus_thread_manager.h"
88 #include "chromeos/dbus/power_manager_client.h" 88 #include "chromeos/dbus/power_manager_client.h"
89 #include "chromeos/dbus/session_manager_client.h" 89 #include "chromeos/dbus/session_manager_client.h"
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 switches::kEnableScreensaverExtensions)) { 589 switches::kEnableScreensaverExtensions)) {
590 screensaver_controller_.reset(new ScreensaverController()); 590 screensaver_controller_.reset(new ScreensaverController());
591 } 591 }
592 suspend_observer_.reset(new SuspendObserver()); 592 suspend_observer_.reset(new SuspendObserver());
593 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { 593 if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
594 power_state_override_ = new PowerStateOverride( 594 power_state_override_ = new PowerStateOverride(
595 PowerStateOverride::BLOCK_DISPLAY_SLEEP); 595 PowerStateOverride::BLOCK_DISPLAY_SLEEP);
596 } 596 }
597 chromeos::accessibility::Initialize(); 597 chromeos::accessibility::Initialize();
598 598
599 removable_device_notifications_ = 599 storage_monitor_ =
600 new RemovableDeviceNotificationsCros(); 600 new StorageMonitorCros();
vandebo (ex-Chrome) 2013/03/01 19:47:39 nit: line wrap.
601 601
602 // Initialize the network portal detector for Chrome OS. The network 602 // Initialize the network portal detector for Chrome OS. The network
603 // portal detector starts to listen for notifications from 603 // portal detector starts to listen for notifications from
604 // NetworkLibrary about changes in the NetworkManager and initiates 604 // NetworkLibrary about changes in the NetworkManager and initiates
605 // captive portal detection for active networks. 605 // captive portal detection for active networks.
606 if (NetworkPortalDetector::IsEnabled() && 606 if (NetworkPortalDetector::IsEnabled() &&
607 NetworkPortalDetector::GetInstance()) { 607 NetworkPortalDetector::GetInstance()) {
608 NetworkPortalDetector::GetInstance()->Init(); 608 NetworkPortalDetector::GetInstance()->Init();
609 } 609 }
610 610
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 817 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
818 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 818 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
819 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 819 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
820 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 820 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
821 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 821 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
822 // This is necessary to start the experiment as a side effect. 822 // This is necessary to start the experiment as a side effect.
823 trial->group(); 823 trial->group();
824 } 824 }
825 825
826 } // namespace chromeos 826 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698