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

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

Issue 2082473002: Move third_party/libjingle/overrides to third_party/webrtc_overrides (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « content/DEPS ('k') | content/zygote/zygote_main_linux.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 #include <stddef.h> 5 #include <stddef.h>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "base/mac/scoped_nsautorelease_pool.h" 45 #include "base/mac/scoped_nsautorelease_pool.h"
46 #include "base/message_loop/message_pump_mac.h" 46 #include "base/message_loop/message_pump_mac.h"
47 #include "third_party/WebKit/public/web/WebView.h" 47 #include "third_party/WebKit/public/web/WebView.h"
48 #endif // OS_MACOSX 48 #endif // OS_MACOSX
49 49
50 #if defined(ENABLE_PLUGINS) 50 #if defined(ENABLE_PLUGINS)
51 #include "content/renderer/pepper/pepper_plugin_registry.h" 51 #include "content/renderer/pepper/pepper_plugin_registry.h"
52 #endif 52 #endif
53 53
54 #if defined(ENABLE_WEBRTC) 54 #if defined(ENABLE_WEBRTC)
55 #include "third_party/libjingle/overrides/init_webrtc.h" 55 #include "third_party/webrtc_overrides/init_webrtc.h"
56 #endif 56 #endif
57 57
58 #if defined(USE_OZONE) 58 #if defined(USE_OZONE)
59 #include "ui/ozone/public/client_native_pixmap_factory.h" 59 #include "ui/ozone/public/client_native_pixmap_factory.h"
60 #endif 60 #endif
61 61
62 namespace content { 62 namespace content {
63 namespace { 63 namespace {
64 // This function provides some ways to test crash and assertion handling 64 // This function provides some ways to test crash and assertion handling
65 // behavior of the renderer. 65 // behavior of the renderer.
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 // ignore shutdown-only leaks. 203 // ignore shutdown-only leaks.
204 __lsan_do_leak_check(); 204 __lsan_do_leak_check();
205 #endif 205 #endif
206 } 206 }
207 platform.PlatformUninitialize(); 207 platform.PlatformUninitialize();
208 TRACE_EVENT_ASYNC_END0("startup", "RendererMain", 0); 208 TRACE_EVENT_ASYNC_END0("startup", "RendererMain", 0);
209 return 0; 209 return 0;
210 } 210 }
211 211
212 } // namespace content 212 } // namespace content
OLDNEW
« no previous file with comments | « content/DEPS ('k') | content/zygote/zygote_main_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698