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

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

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) 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 #ifndef CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
6 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 6 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/chrome_browser_main_linux.h" 10 #include "chrome/browser/chrome_browser_main_linux.h"
11 #include "chrome/browser/chromeos/version_loader.h" 11 #include "chrome/browser/chromeos/version_loader.h"
12 #include "chrome/common/cancelable_task_tracker.h" 12 #include "chrome/common/cancelable_task_tracker.h"
13 13
14 namespace contacts { 14 namespace contacts {
15 class ContactManager; 15 class ContactManager;
16 } 16 }
17 17
18 namespace chromeos { 18 namespace chromeos {
19 19
20 class BrightnessObserver; 20 class BrightnessObserver;
21 class MagnificationManager; 21 class MagnificationManager;
22 class OutputObserver; 22 class OutputObserver;
23 class PowerButtonObserver; 23 class PowerButtonObserver;
24 class PowerStateOverride; 24 class PowerStateOverride;
25 class PrimaryDisplaySwitchObserver; 25 class PrimaryDisplaySwitchObserver;
26 class RemovableDeviceNotificationsCros; 26 class StorageMonitorCros;
27 class ResumeObserver; 27 class ResumeObserver;
28 class ScreenDimmingObserver; 28 class ScreenDimmingObserver;
29 class ScreenLockObserver; 29 class ScreenLockObserver;
30 class ScreensaverController; 30 class ScreensaverController;
31 class SessionManagerObserver; 31 class SessionManagerObserver;
32 class SuspendObserver; 32 class SuspendObserver;
33 class UserActivityNotifier; 33 class UserActivityNotifier;
34 class VideoActivityNotifier; 34 class VideoActivityNotifier;
35 35
36 namespace default_app_order { 36 namespace default_app_order {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 scoped_ptr<SuspendObserver> suspend_observer_; 75 scoped_ptr<SuspendObserver> suspend_observer_;
76 scoped_ptr<ResumeObserver> resume_observer_; 76 scoped_ptr<ResumeObserver> resume_observer_;
77 scoped_ptr<ScreenLockObserver> screen_lock_observer_; 77 scoped_ptr<ScreenLockObserver> screen_lock_observer_;
78 scoped_ptr<ScreensaverController> screensaver_controller_; 78 scoped_ptr<ScreensaverController> screensaver_controller_;
79 scoped_ptr<PowerButtonObserver> power_button_observer_; 79 scoped_ptr<PowerButtonObserver> power_button_observer_;
80 scoped_refptr<PowerStateOverride> power_state_override_; 80 scoped_refptr<PowerStateOverride> power_state_override_;
81 scoped_ptr<PrimaryDisplaySwitchObserver> primary_display_switch_observer_; 81 scoped_ptr<PrimaryDisplaySwitchObserver> primary_display_switch_observer_;
82 scoped_ptr<UserActivityNotifier> user_activity_notifier_; 82 scoped_ptr<UserActivityNotifier> user_activity_notifier_;
83 scoped_ptr<VideoActivityNotifier> video_activity_notifier_; 83 scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
84 scoped_ptr<ScreenDimmingObserver> screen_dimming_observer_; 84 scoped_ptr<ScreenDimmingObserver> screen_dimming_observer_;
85 scoped_refptr<RemovableDeviceNotificationsCros> 85 scoped_refptr<StorageMonitorCros>
86 removable_device_notifications_; 86 storage_monitor_;
vandebo (ex-Chrome) 2013/03/01 19:47:39 nit: line wrap
87 87
88 scoped_ptr<internal::DBusServices> dbus_services_; 88 scoped_ptr<internal::DBusServices> dbus_services_;
89 89
90 VersionLoader cros_version_loader_; 90 VersionLoader cros_version_loader_;
91 CancelableTaskTracker tracker_; 91 CancelableTaskTracker tracker_;
92 bool use_new_network_change_notifier_; 92 bool use_new_network_change_notifier_;
93 93
94 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 94 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
95 }; 95 };
96 96
97 } // namespace chromeos 97 } // namespace chromeos
98 98
99 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 99 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698