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

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

Issue 800603002: Move MemoryPressureObserverChromeOS instantiation from Chrome to Content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moving again Created 6 years 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 "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/external_metrics.h"
12 #include "chrome/browser/chromeos/version_loader.h" 12 #include "chrome/browser/chromeos/version_loader.h"
13 13
14 namespace base {
15 class MemoryPressureObserverChromeOS;
16 }
17
18 namespace content { 14 namespace content {
19 class PowerSaveBlocker; 15 class PowerSaveBlocker;
20 } 16 }
21 17
22 namespace session_manager { 18 namespace session_manager {
23 class SessionManager; 19 class SessionManager;
24 } 20 }
25 21
26 namespace chromeos { 22 namespace chromeos {
27 23
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 scoped_ptr<WakeOnWifiManager> wake_on_wifi_manager_; 79 scoped_ptr<WakeOnWifiManager> wake_on_wifi_manager_;
84 80
85 scoped_ptr<internal::DBusServices> dbus_services_; 81 scoped_ptr<internal::DBusServices> dbus_services_;
86 82
87 scoped_ptr<session_manager::SessionManager> session_manager_; 83 scoped_ptr<session_manager::SessionManager> session_manager_;
88 84
89 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; 85 scoped_ptr<EventRewriterController> keyboard_event_rewriters_;
90 86
91 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; 87 scoped_refptr<chromeos::ExternalMetrics> external_metrics_;
92 88
93 scoped_ptr<base::MemoryPressureObserverChromeOS> memory_pressure_observer_;
94
95 bool use_new_network_change_notifier_; 89 bool use_new_network_change_notifier_;
96 90
97 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 91 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
98 }; 92 };
99 93
100 } // namespace chromeos 94 } // namespace chromeos
101 95
102 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 96 #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') | content/browser/browser_main_loop.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698