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

Unified Diff: base/base.gypi

Issue 1149223002: Avoid basename conflict from memory_pressure_monitor.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: includes Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gyp ('k') | base/chromeos/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 82d810e36eb5bd614d949e9b81eafe6126f36441..9bd0c28c41114f77817f6cdd00bb44a48204da6d 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -128,8 +128,6 @@
'callback_internal.h',
'callback_list.h',
'cancelable_callback.h',
- 'chromeos/memory_pressure_monitor.cc',
- 'chromeos/memory_pressure_monitor.h',
'command_line.cc',
'command_line.h',
'compiler_specific.h',
@@ -296,8 +294,6 @@
'mac/mac_util.mm',
'mac/mach_logging.cc',
'mac/mach_logging.h',
- 'mac/memory_pressure_monitor.cc',
- 'mac/memory_pressure_monitor.h',
'mac/objc_property_releaser.h',
'mac/objc_property_releaser.mm',
'mac/os_crash_dumps.cc',
@@ -342,6 +338,12 @@
'memory/memory_pressure_listener.h',
'memory/memory_pressure_monitor.cc',
'memory/memory_pressure_monitor.h',
+ 'memory/memory_pressure_monitor_chromeos.cc',
+ 'memory/memory_pressure_monitor_chromeos.h',
+ 'memory/memory_pressure_monitor_mac.cc',
+ 'memory/memory_pressure_monitor_mac.h',
+ 'memory/memory_pressure_monitor_win.cc',
+ 'memory/memory_pressure_monitor_win.h',
'memory/raw_scoped_refptr_mismatch_checker.h',
'memory/ref_counted.cc',
'memory/ref_counted.h',
@@ -709,8 +711,6 @@
'win/iat_patch_function.h',
'win/iunknown_impl.cc',
'win/iunknown_impl.h',
- 'win/memory_pressure_monitor.cc',
- 'win/memory_pressure_monitor.h',
'win/message_window.cc',
'win/message_window.h',
'win/metro.cc',
« no previous file with comments | « base/base.gyp ('k') | base/chromeos/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698