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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1486043002: [webnfc] Implement push method for Android nfc mojo service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@step_6_add_mojo_service_CL
Patch Set: Rebased to master. Created 4 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 2398 matching lines...) Expand 10 before | Expand all | Expand 10 after
2409 GetProxy(&remote_interfaces); 2409 GetProxy(&remote_interfaces);
2410 remote_interfaces_.reset(new shell::InterfaceProvider); 2410 remote_interfaces_.reset(new shell::InterfaceProvider);
2411 remote_interfaces_->Bind(std::move(remote_interfaces)); 2411 remote_interfaces_->Bind(std::move(remote_interfaces));
2412 frame_->GetInterfaceProvider(std::move(remote_interfaces_request)); 2412 frame_->GetInterfaceProvider(std::move(remote_interfaces_request));
2413 2413
2414 #if defined(OS_ANDROID) 2414 #if defined(OS_ANDROID)
2415 service_registry_android_ = 2415 service_registry_android_ =
2416 ServiceRegistryAndroid::Create(interface_registry_.get(), 2416 ServiceRegistryAndroid::Create(interface_registry_.get(),
2417 remote_interfaces_.get()); 2417 remote_interfaces_.get());
2418 ServiceRegistrarAndroid::RegisterFrameHostServices( 2418 ServiceRegistrarAndroid::RegisterFrameHostServices(
2419 service_registry_android_.get()); 2419 service_registry_android_.get(), this);
2420 #endif 2420 #endif
2421 } 2421 }
2422 2422
2423 void RenderFrameHostImpl::InvalidateMojoConnection() { 2423 void RenderFrameHostImpl::InvalidateMojoConnection() {
2424 #if defined(OS_ANDROID) 2424 #if defined(OS_ANDROID)
2425 // The Android-specific service registry has a reference to 2425 // The Android-specific service registry has a reference to
2426 // |service_registry_| and thus must be torn down first. 2426 // |service_registry_| and thus must be torn down first.
2427 service_registry_android_.reset(); 2427 service_registry_android_.reset();
2428 #endif 2428 #endif
2429 2429
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
2958 // handler after it's destroyed so it can't run after the RFHI is destroyed. 2958 // handler after it's destroyed so it can't run after the RFHI is destroyed.
2959 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 2959 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
2960 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 2960 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
2961 } 2961 }
2962 2962
2963 void RenderFrameHostImpl::DeleteWebBluetoothService() { 2963 void RenderFrameHostImpl::DeleteWebBluetoothService() {
2964 web_bluetooth_service_.reset(); 2964 web_bluetooth_service_.reset();
2965 } 2965 }
2966 2966
2967 } // namespace content 2967 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698