| OLD | NEW |
| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 scoped_ptr<default_app_order::ExternalLoader> app_order_loader_; | 60 scoped_ptr<default_app_order::ExternalLoader> app_order_loader_; |
| 61 scoped_ptr<ExtensionSystemEventObserver> extension_system_event_observer_; | 61 scoped_ptr<ExtensionSystemEventObserver> extension_system_event_observer_; |
| 62 scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_; | 62 scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_; |
| 63 scoped_ptr<PowerPrefs> power_prefs_; | 63 scoped_ptr<PowerPrefs> power_prefs_; |
| 64 scoped_ptr<PowerButtonObserver> power_button_observer_; | 64 scoped_ptr<PowerButtonObserver> power_button_observer_; |
| 65 scoped_ptr<content::PowerSaveBlocker> retail_mode_power_save_blocker_; | 65 scoped_ptr<content::PowerSaveBlocker> retail_mode_power_save_blocker_; |
| 66 scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_; | 66 scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_; |
| 67 scoped_ptr<DataPromoNotification> data_promo_notification_; | 67 scoped_ptr<DataPromoNotification> data_promo_notification_; |
| 68 | 68 |
| 69 scoped_ptr<internal::DBusServices> dbus_services_; | 69 scoped_ptr<internal::DBusServices> dbus_services_; |
| 70 |
| 71 #if defined(USE_X11) |
| 70 scoped_ptr<EventRewriter> event_rewriter_; | 72 scoped_ptr<EventRewriter> event_rewriter_; |
| 73 #endif |
| 71 | 74 |
| 72 VersionLoader cros_version_loader_; | 75 VersionLoader cros_version_loader_; |
| 73 base::CancelableTaskTracker tracker_; | 76 base::CancelableTaskTracker tracker_; |
| 74 bool use_new_network_change_notifier_; | 77 bool use_new_network_change_notifier_; |
| 75 | 78 |
| 76 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); | 79 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); |
| 77 }; | 80 }; |
| 78 | 81 |
| 79 } // namespace chromeos | 82 } // namespace chromeos |
| 80 | 83 |
| 81 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 84 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
| OLD | NEW |