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

Unified Diff: base/memory/memory_pressure_monitor_chromeos.cc

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
Index: base/memory/memory_pressure_monitor_chromeos.cc
diff --git a/base/chromeos/memory_pressure_monitor.cc b/base/memory/memory_pressure_monitor_chromeos.cc
similarity index 99%
rename from base/chromeos/memory_pressure_monitor.cc
rename to base/memory/memory_pressure_monitor_chromeos.cc
index 5e8aadfbd81871713bb25bc19d0dde015fd70212..640e4633fd51c7cb9d3e820af18c62a17ea14f0b 100644
--- a/base/chromeos/memory_pressure_monitor.cc
+++ b/base/memory/memory_pressure_monitor_chromeos.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/chromeos/memory_pressure_monitor.h"
+#include "base/memory/memory_pressure_monitor_chromeos.h"
#include <fcntl.h>
#include <sys/select.h>
« no previous file with comments | « base/memory/memory_pressure_monitor_chromeos.h ('k') | base/memory/memory_pressure_monitor_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698