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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « chromeos/chromeos_switches.h ('k') | no next file » | 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 #include "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/memory_pressure_monitor.h" 10 #include "base/memory/memory_pressure_monitor.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #include "base/android/jni_android.h" 84 #include "base/android/jni_android.h"
85 #include "content/browser/android/browser_startup_controller.h" 85 #include "content/browser/android/browser_startup_controller.h"
86 #include "content/browser/android/browser_surface_texture_manager.h" 86 #include "content/browser/android/browser_surface_texture_manager.h"
87 #include "content/browser/android/tracing_controller_android.h" 87 #include "content/browser/android/tracing_controller_android.h"
88 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h" 88 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h"
89 #include "content/public/browser/screen_orientation_provider.h" 89 #include "content/public/browser/screen_orientation_provider.h"
90 #include "ui/gl/gl_surface.h" 90 #include "ui/gl/gl_surface.h"
91 #endif 91 #endif
92 92
93 #if defined(OS_MACOSX) && !defined(OS_IOS) 93 #if defined(OS_MACOSX) && !defined(OS_IOS)
94 #include "base/mac/memory_pressure_monitor.h" 94 #include "base/memory/memory_pressure_monitor_mac.h"
95 #include "content/browser/bootstrap_sandbox_mac.h" 95 #include "content/browser/bootstrap_sandbox_mac.h"
96 #include "content/browser/cocoa/system_hotkey_helper_mac.h" 96 #include "content/browser/cocoa/system_hotkey_helper_mac.h"
97 #include "content/browser/compositor/browser_compositor_view_mac.h" 97 #include "content/browser/compositor/browser_compositor_view_mac.h"
98 #include "content/browser/theme_helper_mac.h" 98 #include "content/browser/theme_helper_mac.h"
99 #endif 99 #endif
100 100
101 #if defined(OS_WIN) 101 #if defined(OS_WIN)
102 #include <windows.h> 102 #include <windows.h>
103 #include <commctrl.h> 103 #include <commctrl.h>
104 #include <shellapi.h> 104 #include <shellapi.h>
105 105
106 #include "base/win/memory_pressure_monitor.h" 106 #include "base/memory/memory_pressure_monitor_win.h"
107 #include "content/browser/system_message_window_win.h" 107 #include "content/browser/system_message_window_win.h"
108 #include "content/common/sandbox_win.h" 108 #include "content/common/sandbox_win.h"
109 #include "net/base/winsock_init.h" 109 #include "net/base/winsock_init.h"
110 #include "ui/base/l10n/l10n_util_win.h" 110 #include "ui/base/l10n/l10n_util_win.h"
111 #endif 111 #endif
112 112
113 #if defined(OS_CHROMEOS) 113 #if defined(OS_CHROMEOS)
114 #include "base/chromeos/memory_pressure_monitor.h" 114 #include "base/memory/memory_pressure_monitor_chromeos.h"
115 #include "chromeos/chromeos_switches.h" 115 #include "chromeos/chromeos_switches.h"
116 #endif 116 #endif
117 117
118 #if defined(USE_GLIB) 118 #if defined(USE_GLIB)
119 #include <glib-object.h> 119 #include <glib-object.h>
120 #endif 120 #endif
121 121
122 #if defined(OS_LINUX) && defined(USE_UDEV) 122 #if defined(OS_LINUX) && defined(USE_UDEV)
123 #include "content/browser/device_monitor_udev.h" 123 #include "content/browser/device_monitor_udev.h"
124 #elif defined(OS_MACOSX) && !defined(OS_IOS) 124 #elif defined(OS_MACOSX) && !defined(OS_IOS)
(...skipping 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 1327
1328 void BrowserMainLoop::EndStartupTracing() { 1328 void BrowserMainLoop::EndStartupTracing() {
1329 is_tracing_startup_ = false; 1329 is_tracing_startup_ = false;
1330 TracingController::GetInstance()->DisableRecording( 1330 TracingController::GetInstance()->DisableRecording(
1331 TracingController::CreateFileSink( 1331 TracingController::CreateFileSink(
1332 startup_trace_file_, 1332 startup_trace_file_,
1333 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1333 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1334 } 1334 }
1335 1335
1336 } // namespace content 1336 } // namespace content
OLDNEW
« no previous file with comments | « chromeos/chromeos_switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698