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

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

Issue 2527973003: Consolidate code monitoring low memory kills and OOM kills to MemoryKillsMonitor on ChromeOS. (Closed)
Patch Set: move unittest to chromeos only build rule Created 4 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 <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/task/cancelable_task_tracker.h" 11 #include "base/task/cancelable_task_tracker.h"
12 #include "chrome/browser/chrome_browser_main_linux.h" 12 #include "chrome/browser/chrome_browser_main_linux.h"
13 #include "chrome/browser/chromeos/external_metrics.h" 13 #include "chrome/browser/chromeos/external_metrics.h"
14 #include "chrome/browser/memory/memory_kills_monitor.h"
14 #include "chromeos/system/version_loader.h" 15 #include "chromeos/system/version_loader.h"
15 16
16 namespace session_manager { 17 namespace session_manager {
17 class SessionManager; 18 class SessionManager;
18 } 19 }
19 20
20 namespace arc { 21 namespace arc {
21 class ArcServiceLauncher; 22 class ArcServiceLauncher;
22 } 23 }
23 24
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 93
93 std::unique_ptr<EventRewriterController> keyboard_event_rewriters_; 94 std::unique_ptr<EventRewriterController> keyboard_event_rewriters_;
94 95
95 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; 96 scoped_refptr<chromeos::ExternalMetrics> external_metrics_;
96 97
97 std::unique_ptr<arc::ArcServiceLauncher> arc_service_launcher_; 98 std::unique_ptr<arc::ArcServiceLauncher> arc_service_launcher_;
98 99
99 std::unique_ptr<LowDiskNotification> low_disk_notification_; 100 std::unique_ptr<LowDiskNotification> low_disk_notification_;
100 std::unique_ptr<ArcKioskAppManager> arc_kiosk_app_manager_; 101 std::unique_ptr<ArcKioskAppManager> arc_kiosk_app_manager_;
101 102
103 std::unique_ptr<memory::MemoryKillsMonitor::Handle> memory_kills_monitor_;
104
102 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 105 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
103 }; 106 };
104 107
105 } // namespace chromeos 108 } // namespace chromeos
106 109
107 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 110 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698