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

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

Issue 289303003: [Metrics] Move ExternalMetrics ownership to ChromeBrowserMainPartsChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« 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"
11 #include "chrome/browser/chromeos/external_metrics.h"
11 #include "chrome/browser/chromeos/version_loader.h" 12 #include "chrome/browser/chromeos/version_loader.h"
12 13
13 namespace content { 14 namespace content {
14 class PowerSaveBlocker; 15 class PowerSaveBlocker;
15 } 16 }
16 17
17 namespace chromeos { 18 namespace chromeos {
18 19
19 class DataPromoNotification; 20 class DataPromoNotification;
20 class EventRewriter; 21 class EventRewriter;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 scoped_ptr<PowerPrefs> power_prefs_; 65 scoped_ptr<PowerPrefs> power_prefs_;
65 scoped_ptr<PowerButtonObserver> power_button_observer_; 66 scoped_ptr<PowerButtonObserver> power_button_observer_;
66 scoped_ptr<content::PowerSaveBlocker> retail_mode_power_save_blocker_; 67 scoped_ptr<content::PowerSaveBlocker> retail_mode_power_save_blocker_;
67 scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_; 68 scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_;
68 scoped_ptr<DataPromoNotification> data_promo_notification_; 69 scoped_ptr<DataPromoNotification> data_promo_notification_;
69 70
70 scoped_ptr<internal::DBusServices> dbus_services_; 71 scoped_ptr<internal::DBusServices> dbus_services_;
71 72
72 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; 73 scoped_ptr<EventRewriterController> keyboard_event_rewriters_;
73 74
75 scoped_refptr<chromeos::ExternalMetrics> external_metrics_;
76
74 VersionLoader cros_version_loader_; 77 VersionLoader cros_version_loader_;
75 base::CancelableTaskTracker tracker_; 78 base::CancelableTaskTracker tracker_;
76 bool use_new_network_change_notifier_; 79 bool use_new_network_change_notifier_;
77 80
78 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 81 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
79 }; 82 };
80 83
81 } // namespace chromeos 84 } // namespace chromeos
82 85
83 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 86 #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