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

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

Issue 137263007: Move CancelableTaskTracker to //base/task/CancelableTaskTracker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move to base/task/cancelable_task_tracker* Created 6 years, 10 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/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/task/cancelable_task_tracker.h"
9 #include "chrome/browser/chrome_browser_main_linux.h" 10 #include "chrome/browser/chrome_browser_main_linux.h"
10 #include "chrome/browser/chromeos/version_loader.h" 11 #include "chrome/browser/chromeos/version_loader.h"
11 #include "chrome/common/cancelable_task_tracker.h"
12 12
13 namespace contacts { 13 namespace contacts {
14 class ContactManager; 14 class ContactManager;
15 } 15 }
16 16
17 namespace content { 17 namespace content {
18 class PowerSaveBlocker; 18 class PowerSaveBlocker;
19 } 19 }
20 20
21 namespace chromeos { 21 namespace chromeos {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_; 66 scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_;
67 scoped_ptr<PowerPrefs> power_prefs_; 67 scoped_ptr<PowerPrefs> power_prefs_;
68 scoped_ptr<PowerButtonObserver> power_button_observer_; 68 scoped_ptr<PowerButtonObserver> power_button_observer_;
69 scoped_ptr<content::PowerSaveBlocker> retail_mode_power_save_blocker_; 69 scoped_ptr<content::PowerSaveBlocker> retail_mode_power_save_blocker_;
70 scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_; 70 scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_;
71 scoped_ptr<DataPromoNotification> data_promo_notification_; 71 scoped_ptr<DataPromoNotification> data_promo_notification_;
72 72
73 scoped_ptr<internal::DBusServices> dbus_services_; 73 scoped_ptr<internal::DBusServices> dbus_services_;
74 74
75 VersionLoader cros_version_loader_; 75 VersionLoader cros_version_loader_;
76 CancelableTaskTracker tracker_; 76 base::CancelableTaskTracker tracker_;
77 bool use_new_network_change_notifier_; 77 bool use_new_network_change_notifier_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 79 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
80 }; 80 };
81 81
82 } // namespace chromeos 82 } // namespace chromeos
83 83
84 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 84 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/boot_times_loader.h ('k') | chrome/browser/chromeos/login/version_info_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698