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

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

Issue 1922923002: bluetooth: Move requestDevice to mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-separate-tests-request-device
Patch Set: Address moar comments! Created 4 years, 7 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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 4305 matching lines...) Expand 10 before | Expand all | Expand 10 after
4316 const WebURL& url) { 4316 const WebURL& url) {
4317 bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture(); 4317 bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture();
4318 Send(new FrameHostMsg_UnregisterProtocolHandler( 4318 Send(new FrameHostMsg_UnregisterProtocolHandler(
4319 routing_id_, 4319 routing_id_,
4320 base::UTF16ToUTF8(base::StringPiece16(scheme)), 4320 base::UTF16ToUTF8(base::StringPiece16(scheme)),
4321 url, 4321 url,
4322 user_gesture)); 4322 user_gesture));
4323 } 4323 }
4324 4324
4325 blink::WebBluetooth* RenderFrameImpl::bluetooth() { 4325 blink::WebBluetooth* RenderFrameImpl::bluetooth() {
4326 // ChildThreadImpl::current() is null in some tests. 4326 if (!bluetooth_.get()) {
4327 if (!bluetooth_ && ChildThreadImpl::current()) { 4327 bluetooth_.reset(new WebBluetoothImpl(GetServiceRegistry()));
4328 bluetooth_.reset(new WebBluetoothImpl(
4329 GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(),
4330 routing_id_));
4331 } 4328 }
4332
4333 return bluetooth_.get(); 4329 return bluetooth_.get();
4334 } 4330 }
4335 4331
4336 void RenderFrameImpl::didSerializeDataForFrame( 4332 void RenderFrameImpl::didSerializeDataForFrame(
4337 const WebCString& data, 4333 const WebCString& data,
4338 WebFrameSerializerClient::FrameSerializationStatus status) { 4334 WebFrameSerializerClient::FrameSerializationStatus status) {
4339 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished; 4335 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished;
4340 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse( 4336 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse(
4341 routing_id_, data, end_of_data)); 4337 routing_id_, data, end_of_data));
4342 } 4338 }
(...skipping 1793 matching lines...) Expand 10 before | Expand all | Expand 10 after
6136 // event target. Potentially a Pepper plugin will receive the event. 6132 // event target. Potentially a Pepper plugin will receive the event.
6137 // In order to tell whether a plugin gets the last mouse event and which it 6133 // In order to tell whether a plugin gets the last mouse event and which it
6138 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6134 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6139 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6135 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6140 // |pepper_last_mouse_event_target_|. 6136 // |pepper_last_mouse_event_target_|.
6141 pepper_last_mouse_event_target_ = nullptr; 6137 pepper_last_mouse_event_target_ = nullptr;
6142 #endif 6138 #endif
6143 } 6139 }
6144 6140
6145 } // namespace content 6141 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698