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

Side by Side Diff: content/renderer/renderer_main.cc

Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
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 "base/base_switches.h" 5 #include "base/base_switches.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/debug/debugger.h" 7 #include "base/debug/debugger.h"
8 #include "base/debug/stack_trace.h" 8 #include "base/debug/stack_trace.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 22 matching lines...) Expand all
33 #if defined(OS_ANDROID) 33 #if defined(OS_ANDROID)
34 #include "base/android/library_loader/library_loader_hooks.h" 34 #include "base/android/library_loader/library_loader_hooks.h"
35 #include "third_party/skia/include/core/SkGraphics.h" 35 #include "third_party/skia/include/core/SkGraphics.h"
36 #endif // OS_ANDROID 36 #endif // OS_ANDROID
37 37
38 #if defined(OS_MACOSX) 38 #if defined(OS_MACOSX)
39 #include <Carbon/Carbon.h> 39 #include <Carbon/Carbon.h>
40 #include <signal.h> 40 #include <signal.h>
41 #include <unistd.h> 41 #include <unistd.h>
42 42
43 #include "base/mac/mac_util.h"
44 #include "base/mac/scoped_nsautorelease_pool.h" 43 #include "base/mac/scoped_nsautorelease_pool.h"
45 #include "base/message_loop/message_pump_mac.h" 44 #include "base/message_loop/message_pump_mac.h"
46 #include "third_party/WebKit/public/web/WebView.h" 45 #include "third_party/WebKit/public/web/WebView.h"
47 #endif // OS_MACOSX 46 #endif // OS_MACOSX
48 47
49 #if defined(ENABLE_PLUGINS) 48 #if defined(ENABLE_PLUGINS)
50 #include "content/renderer/pepper/pepper_plugin_registry.h" 49 #include "content/renderer/pepper/pepper_plugin_registry.h"
51 #endif 50 #endif
52 51
53 #if defined(ENABLE_WEBRTC) 52 #if defined(ENABLE_WEBRTC)
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 base::MessageLoop::current()->Run(); 234 base::MessageLoop::current()->Run();
236 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); 235 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
237 } 236 }
238 } 237 }
239 platform.PlatformUninitialize(); 238 platform.PlatformUninitialize();
240 TRACE_EVENT_END_ETW("RendererMain", 0, ""); 239 TRACE_EVENT_END_ETW("RendererMain", 0, "");
241 return 0; 240 return 0;
242 } 241 }
243 242
244 } // namespace content 243 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_graphics_2d_host.cc ('k') | content/test/test_blink_web_unit_test_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698