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

Unified Diff: base/memory/memory_pressure_monitor_chromeos.h

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/memory/OWNERS ('k') | base/memory/memory_pressure_monitor_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/memory_pressure_monitor_chromeos.h
diff --git a/base/chromeos/memory_pressure_monitor.h b/base/memory/memory_pressure_monitor_chromeos.h
similarity index 96%
rename from base/chromeos/memory_pressure_monitor.h
rename to base/memory/memory_pressure_monitor_chromeos.h
index bed1ec39f6ac893e172c5bdb1d7ba4b808398b55..ff8992a56314ae33b29bac7dc4c40c20f6af42b6 100644
--- a/base/chromeos/memory_pressure_monitor.h
+++ b/base/memory/memory_pressure_monitor_chromeos.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_CHROMEOS_MEMORY_PRESSURE_MONITOR_H_
-#define BASE_CHROMEOS_MEMORY_PRESSURE_MONITOR_H_
+#ifndef BASE_MEMORY_MEMORY_PRESSURE_MONITOR_CHROMEOS_H_
+#define BASE_MEMORY_MEMORY_PRESSURE_MONITOR_CHROMEOS_H_
#include "base/base_export.h"
#include "base/files/scoped_file.h"
@@ -116,4 +116,4 @@ class BASE_EXPORT MemoryPressureMonitor : public base::MemoryPressureMonitor {
} // namespace chromeos
} // namespace base
-#endif // BASE_CHROMEOS_MEMORY_PRESSURE_MONITOR_H_
+#endif // BASE_MEMORY_MEMORY_PRESSURE_MONITOR_CHROMEOS_H_
« no previous file with comments | « base/memory/OWNERS ('k') | base/memory/memory_pressure_monitor_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698