base/memory/memory_pressure_monitor_mac.h - Issue 1149223002: Avoid basename conflict from memory_pressure_monitor.cc

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: base/memory/memory_pressure_monitor_mac.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 unified diff | Download patch

« no previous file with comments | « base/memory/memory_pressure_monitor_chromeos_unittest.cc ('k') | base/memory/memory_pressure_monitor_mac.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef BASE_MAC_MEMORY_PRESSURE_MONITOR_H_	5 #ifndef BASE_MEMORY_MEMORY_PRESSURE_MONITOR_MAC_H_

6 #define BASE_MAC_MEMORY_PRESSURE_MONITOR_H_	6 #define BASE_MEMORY_MEMORY_PRESSURE_MONITOR_MAC_H_

7	7

8 #include <dispatch/dispatch.h>	8 #include <dispatch/dispatch.h>

9	9

10 #include "base/base_export.h"	10 #include "base/base_export.h"

11 #include "base/memory/memory_pressure_listener.h"	11 #include "base/memory/memory_pressure_listener.h"

12 #include "base/memory/memory_pressure_monitor.h"	12 #include "base/memory/memory_pressure_monitor.h"

13	13

14 // The following was added to <dispatch/source.h> after 10.8.	14 // The following was added to <dispatch/source.h> after 10.8.

15 // TODO(shrike): Remove the DISPATCH_MEMORYPRESSURE_NORMAL ifndef once builders	15 // TODO(shrike): Remove the DISPATCH_MEMORYPRESSURE_NORMAL ifndef once builders

16 // reach 10.9 or higher.	16 // reach 10.9 or higher.

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53	53

54 scoped_ptr<dispatch_source_s, DispatchSourceSDeleter>	54 scoped_ptr<dispatch_source_s, DispatchSourceSDeleter>

55 memory_level_event_source_;	55 memory_level_event_source_;

56	56

57 DISALLOW_COPY_AND_ASSIGN(MemoryPressureMonitor);	57 DISALLOW_COPY_AND_ASSIGN(MemoryPressureMonitor);

58 };	58 };

59	59

60 } // namespace mac	60 } // namespace mac

61 } // namespace base	61 } // namespace base

62	62

63 #endif // BASE_MAC_MEMORY_PRESSURE_MONITOR_H_	63 #endif // BASE_MEMORY_MEMORY_PRESSURE_MONITOR_MAC_H_

OLD	NEW