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

Side by Side Diff: chromeos/chromeos_switches.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/win/memory_pressure_monitor_unittest.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CHROMEOS_CHROMEOS_SWITCHES_H_ 5 #ifndef CHROMEOS_CHROMEOS_SWITCHES_H_
6 #define CHROMEOS_CHROMEOS_SWITCHES_H_ 6 #define CHROMEOS_CHROMEOS_SWITCHES_H_
7 7
8 #include "base/chromeos/memory_pressure_monitor.h" 8 #include "base/memory/memory_pressure_monitor_chromeos.h"
9 #include "chromeos/chromeos_export.h" 9 #include "chromeos/chromeos_export.h"
10 10
11 namespace chromeos { 11 namespace chromeos {
12 namespace switches { 12 namespace switches {
13 13
14 // Switches that are used in src/chromeos must go here. 14 // Switches that are used in src/chromeos must go here.
15 // Other switches that apply just to chromeos code should go here also (along 15 // Other switches that apply just to chromeos code should go here also (along
16 // with any code that is specific to the chromeos system). ChromeOS specific UI 16 // with any code that is specific to the chromeos system). ChromeOS specific UI
17 // should be in src/ash. 17 // should be in src/ash.
18 18
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 CHROMEOS_EXPORT bool WakeOnWifiEnabled(); 114 CHROMEOS_EXPORT bool WakeOnWifiEnabled();
115 115
116 CHROMEOS_EXPORT bool MemoryPressureHandlingEnabled(); 116 CHROMEOS_EXPORT bool MemoryPressureHandlingEnabled();
117 CHROMEOS_EXPORT base::chromeos::MemoryPressureMonitor::MemoryPressureThresholds 117 CHROMEOS_EXPORT base::chromeos::MemoryPressureMonitor::MemoryPressureThresholds
118 GetMemoryPressureThresholds(); 118 GetMemoryPressureThresholds();
119 119
120 } // namespace switches 120 } // namespace switches
121 } // namespace chromeos 121 } // namespace chromeos
122 122
123 #endif // CHROMEOS_CHROMEOS_SWITCHES_H_ 123 #endif // CHROMEOS_CHROMEOS_SWITCHES_H_
OLDNEW
« no previous file with comments | « base/win/memory_pressure_monitor_unittest.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698