| OLD | NEW |
| 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/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 446 RenderThreadImpl::RenderThreadImpl( | 446 RenderThreadImpl::RenderThreadImpl( |
| 447 scoped_ptr<base::MessageLoop> main_message_loop) | 447 scoped_ptr<base::MessageLoop> main_message_loop) |
| 448 : ChildThreadImpl(Options(ShouldUseMojoChannel())), | 448 : ChildThreadImpl(Options(ShouldUseMojoChannel())), |
| 449 main_message_loop_(main_message_loop.Pass()) { | 449 main_message_loop_(main_message_loop.Pass()) { |
| 450 Init(); | 450 Init(); |
| 451 } | 451 } |
| 452 | 452 |
| 453 void RenderThreadImpl::Init() { | 453 void RenderThreadImpl::Init() { |
| 454 TRACE_EVENT_BEGIN_ETW("RenderThreadImpl::Init", 0, ""); | 454 TRACE_EVENT_BEGIN_ETW("RenderThreadImpl::Init", 0, ""); |
| 455 | 455 |
| 456 base::debug::TraceLog::GetInstance()->SetThreadSortIndex( | 456 base::trace_event::TraceLog::GetInstance()->SetThreadSortIndex( |
| 457 base::PlatformThread::CurrentId(), | 457 base::PlatformThread::CurrentId(), |
| 458 kTraceEventRendererMainThreadSortIndex); | 458 kTraceEventRendererMainThreadSortIndex); |
| 459 | 459 |
| 460 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 460 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
| 461 // On Mac and Android, the select popups are rendered by the browser. | 461 // On Mac and Android, the select popups are rendered by the browser. |
| 462 blink::WebView::setUseExternalPopupMenus(true); | 462 blink::WebView::setUseExternalPopupMenus(true); |
| 463 #endif | 463 #endif |
| 464 | 464 |
| 465 lazy_tls.Pointer()->Set(this); | 465 lazy_tls.Pointer()->Set(this); |
| 466 | 466 |
| (...skipping 1355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1822 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 1822 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 1823 mojo::ServiceProviderPtr exposed_services) | 1823 mojo::ServiceProviderPtr exposed_services) |
| 1824 : services(services.Pass()), | 1824 : services(services.Pass()), |
| 1825 exposed_services(exposed_services.Pass()) { | 1825 exposed_services(exposed_services.Pass()) { |
| 1826 } | 1826 } |
| 1827 | 1827 |
| 1828 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { | 1828 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { |
| 1829 } | 1829 } |
| 1830 | 1830 |
| 1831 } // namespace content | 1831 } // namespace content |
| OLD | NEW |