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

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

Issue 722043004: Clean up wake on wifi handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/task/cancelable_task_tracker.h" 9 #include "base/task/cancelable_task_tracker.h"
10 #include "chrome/browser/chrome_browser_main_linux.h" 10 #include "chrome/browser/chrome_browser_main_linux.h"
(...skipping 16 matching lines...) Expand all
27 class ExtensionSystemEventObserver; 27 class ExtensionSystemEventObserver;
28 class IdleActionWarningObserver; 28 class IdleActionWarningObserver;
29 class LightBar; 29 class LightBar;
30 class MagnificationManager; 30 class MagnificationManager;
31 class PeripheralBatteryObserver; 31 class PeripheralBatteryObserver;
32 class PowerButtonObserver; 32 class PowerButtonObserver;
33 class PowerPrefs; 33 class PowerPrefs;
34 class RendererFreezer; 34 class RendererFreezer;
35 class SessionManagerObserver; 35 class SessionManagerObserver;
36 class SwapMetrics; 36 class SwapMetrics;
37 class WakeOnWifiManager;
37 38
38 namespace default_app_order { 39 namespace default_app_order {
39 class ExternalLoader; 40 class ExternalLoader;
40 } 41 }
41 42
42 namespace internal { 43 namespace internal {
43 class DBusServices; 44 class DBusServices;
44 } 45 }
45 46
46 class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux { 47 class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
(...skipping 21 matching lines...) Expand all
68 scoped_ptr<default_app_order::ExternalLoader> app_order_loader_; 69 scoped_ptr<default_app_order::ExternalLoader> app_order_loader_;
69 scoped_ptr<ExtensionSystemEventObserver> extension_system_event_observer_; 70 scoped_ptr<ExtensionSystemEventObserver> extension_system_event_observer_;
70 scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_; 71 scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_;
71 scoped_ptr<PowerPrefs> power_prefs_; 72 scoped_ptr<PowerPrefs> power_prefs_;
72 scoped_ptr<PowerButtonObserver> power_button_observer_; 73 scoped_ptr<PowerButtonObserver> power_button_observer_;
73 scoped_ptr<content::PowerSaveBlocker> retail_mode_power_save_blocker_; 74 scoped_ptr<content::PowerSaveBlocker> retail_mode_power_save_blocker_;
74 scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_; 75 scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_;
75 scoped_ptr<DataPromoNotification> data_promo_notification_; 76 scoped_ptr<DataPromoNotification> data_promo_notification_;
76 scoped_ptr<RendererFreezer> renderer_freezer_; 77 scoped_ptr<RendererFreezer> renderer_freezer_;
77 scoped_ptr<LightBar> light_bar_; 78 scoped_ptr<LightBar> light_bar_;
79 scoped_ptr<WakeOnWifiManager> wake_on_wifi_manager_;
78 80
79 scoped_ptr<internal::DBusServices> dbus_services_; 81 scoped_ptr<internal::DBusServices> dbus_services_;
80 82
81 scoped_ptr<session_manager::SessionManager> session_manager_; 83 scoped_ptr<session_manager::SessionManager> session_manager_;
82 84
83 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; 85 scoped_ptr<EventRewriterController> keyboard_event_rewriters_;
84 86
85 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; 87 scoped_refptr<chromeos::ExternalMetrics> external_metrics_;
86 88
87 VersionLoader cros_version_loader_; 89 VersionLoader cros_version_loader_;
88 base::CancelableTaskTracker tracker_; 90 base::CancelableTaskTracker tracker_;
89 bool use_new_network_change_notifier_; 91 bool use_new_network_change_notifier_;
90 92
91 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 93 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
92 }; 94 };
93 95
94 } // namespace chromeos 96 } // namespace chromeos
95 97
96 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 98 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698