content/browser/browser_main_loop.cc - Issue 1149223002: Avoid basename conflict from memory_pressure_monitor.cc

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/browser_main_loop.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: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index b55754d172798eaea6117a50516f2745248d47e7..7c90c6461e507bcf49836d253e02d36e7dab9c26 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -91,7 +91,7 @@

#endif

#if defined(OS_MACOSX) && !defined(OS_IOS)

-#include "base/mac/memory_pressure_monitor.h"

+#include "base/memory/memory_pressure_monitor_mac.h"

#include "content/browser/bootstrap_sandbox_mac.h"

#include "content/browser/cocoa/system_hotkey_helper_mac.h"

#include "content/browser/compositor/browser_compositor_view_mac.h"

@@ -103,7 +103,7 @@

#include <commctrl.h>

#include <shellapi.h>

-#include "base/win/memory_pressure_monitor.h"

+#include "base/memory/memory_pressure_monitor_win.h"

#include "content/browser/system_message_window_win.h"

#include "content/common/sandbox_win.h"

#include "net/base/winsock_init.h"

@@ -111,7 +111,7 @@

#endif

#if defined(OS_CHROMEOS)

-#include "base/chromeos/memory_pressure_monitor.h"

+#include "base/memory/memory_pressure_monitor_chromeos.h"

#include "chromeos/chromeos_switches.h"

#endif

« no previous file with comments | « chromeos/chromeos_switches.h ('k') | no next file » | no next file with comments »