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

Unified Diff: content/browser/BUILD.gn

Issue 2332423002: Added memory-monitor for ChromeOS. (Closed)
Patch Set: limit conditionals to only chromeos/linux (win, mac, etc. are automatic) Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/memory/memory_monitor_chromeos.h » ('j') | content/test/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 374866d381ccc69db39d03d29f4592fad6abc4e8..e7e982ad7b2b64c28251d37d924fcf19b881eb66 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -867,8 +867,6 @@ source_set("browser") {
"memory/memory_message_filter.h",
"memory/memory_monitor.cc",
"memory/memory_monitor.h",
- "memory/memory_monitor_linux.cc",
- "memory/memory_monitor_linux.h",
"memory/memory_monitor_win.cc",
"memory/memory_monitor_win.h",
"memory/memory_pressure_controller_impl.cc",
@@ -1383,6 +1381,19 @@ source_set("browser") {
deps += [ "//ui/events" ]
}
+ # Chromeos also defines linux but their memory-monitors conflict.
nasko 2016/09/19 17:05:05 nit: ChromeOS
+ if (is_chromeos) {
+ sources += [
+ "memory/memory_monitor_chromeos.cc",
+ "memory/memory_monitor_chromeos.h",
+ ]
+ } else {
+ sources += [
+ "memory/memory_monitor_linux.cc",
+ "memory/memory_monitor_linux.h",
+ ]
+ }
+
if (!is_win) {
sources += [
"file_descriptor_info_impl.cc",
« no previous file with comments | « no previous file | content/browser/memory/memory_monitor_chromeos.h » ('j') | content/test/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698