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 <utility> | 10 #include <utility> |
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
841 #endif | 841 #endif |
842 | 842 |
843 service_registry()->ConnectToRemoteService( | 843 service_registry()->ConnectToRemoteService( |
844 mojo::GetProxy(&storage_partition_service_)); | 844 mojo::GetProxy(&storage_partition_service_)); |
845 } | 845 } |
846 | 846 |
847 RenderThreadImpl::~RenderThreadImpl() { | 847 RenderThreadImpl::~RenderThreadImpl() { |
848 } | 848 } |
849 | 849 |
850 void RenderThreadImpl::Shutdown() { | 850 void RenderThreadImpl::Shutdown() { |
| 851 #if defined(OS_ANDROID) |
| 852 // Don't allow the render thread to be shut down in single process mode on |
| 853 // Android. Temporary CHECK() to debug http://crbug.com/514141 |
| 854 CHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 855 switches::kSingleProcess)); |
| 856 #endif |
| 857 |
851 FOR_EACH_OBSERVER( | 858 FOR_EACH_OBSERVER( |
852 RenderThreadObserver, observers_, OnRenderProcessShutdown()); | 859 RenderThreadObserver, observers_, OnRenderProcessShutdown()); |
853 | 860 |
854 if (memory_observer_) { | 861 if (memory_observer_) { |
855 message_loop()->RemoveTaskObserver(memory_observer_.get()); | 862 message_loop()->RemoveTaskObserver(memory_observer_.get()); |
856 memory_observer_.reset(); | 863 memory_observer_.reset(); |
857 } | 864 } |
858 | 865 |
859 // Wait for all databases to be closed. | 866 // Wait for all databases to be closed. |
860 if (blink_platform_impl_) { | 867 if (blink_platform_impl_) { |
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2146 } | 2153 } |
2147 | 2154 |
2148 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2155 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
2149 size_t erased = | 2156 size_t erased = |
2150 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2157 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
2151 routing_id_); | 2158 routing_id_); |
2152 DCHECK_EQ(1u, erased); | 2159 DCHECK_EQ(1u, erased); |
2153 } | 2160 } |
2154 | 2161 |
2155 } // namespace content | 2162 } // namespace content |
OLD | NEW |