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

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

Issue 2617883002: Add a new BindInterface() method to Connector. (Closed)
Patch Set: . Created 3 years, 11 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/ppapi_plugin/ppapi_thread.cc ('k') | mash/browser/browser.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 "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 864 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 875
876 // TODO(vmpstr): If the flag sticks, we should clean it up and always have 876 // TODO(vmpstr): If the flag sticks, we should clean it up and always have
877 // image decode tasks. 877 // image decode tasks.
878 are_image_decode_tasks_enabled_ = true; 878 are_image_decode_tasks_enabled_ = true;
879 879
880 categorized_worker_pool_->Start(num_raster_threads); 880 categorized_worker_pool_->Start(num_raster_threads);
881 881
882 discardable_memory::mojom::DiscardableSharedMemoryManagerPtr manager_ptr; 882 discardable_memory::mojom::DiscardableSharedMemoryManagerPtr manager_ptr;
883 if (IsRunningInMash()) { 883 if (IsRunningInMash()) {
884 #if defined(USE_AURA) 884 #if defined(USE_AURA)
885 GetServiceManagerConnection()->GetConnector()->ConnectToInterface( 885 GetServiceManagerConnection()->GetConnector()->BindInterface(
886 ui::mojom::kServiceName, &manager_ptr); 886 ui::mojom::kServiceName, &manager_ptr);
887 #else 887 #else
888 NOTREACHED(); 888 NOTREACHED();
889 #endif 889 #endif
890 } else { 890 } else {
891 ChildThread::Get()->GetRemoteInterfaces()->GetInterface( 891 ChildThread::Get()->GetRemoteInterfaces()->GetInterface(
892 mojo::MakeRequest(&manager_ptr)); 892 mojo::MakeRequest(&manager_ptr));
893 } 893 }
894 894
895 discardable_shared_memory_manager_ = base::MakeUnique< 895 discardable_shared_memory_manager_ = base::MakeUnique<
(...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after
2502 } 2502 }
2503 } 2503 }
2504 2504
2505 void RenderThreadImpl::OnRendererInterfaceRequest( 2505 void RenderThreadImpl::OnRendererInterfaceRequest(
2506 mojom::RendererAssociatedRequest request) { 2506 mojom::RendererAssociatedRequest request) {
2507 DCHECK(!renderer_binding_.is_bound()); 2507 DCHECK(!renderer_binding_.is_bound());
2508 renderer_binding_.Bind(std::move(request)); 2508 renderer_binding_.Bind(std::move(request));
2509 } 2509 }
2510 2510
2511 } // namespace content 2511 } // namespace content
OLDNEW
« no previous file with comments | « content/ppapi_plugin/ppapi_thread.cc ('k') | mash/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698