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

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: Remove debug log 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 4300 matching lines...) Expand 10 before | Expand all | Expand 10 after
4311 const WebURL& url) { 4311 const WebURL& url) {
4312 bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture(); 4312 bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture();
4313 Send(new FrameHostMsg_UnregisterProtocolHandler( 4313 Send(new FrameHostMsg_UnregisterProtocolHandler(
4314 routing_id_, 4314 routing_id_,
4315 base::UTF16ToUTF8(base::StringPiece16(scheme)), 4315 base::UTF16ToUTF8(base::StringPiece16(scheme)),
4316 url, 4316 url,
4317 user_gesture)); 4317 user_gesture));
4318 } 4318 }
4319 4319
4320 blink::WebBluetooth* RenderFrameImpl::bluetooth() { 4320 blink::WebBluetooth* RenderFrameImpl::bluetooth() {
4321 // ChildThreadImpl::current() is null in some tests. 4321 if (!bluetooth_.get()) {
4322 if (!bluetooth_ && ChildThreadImpl::current()) { 4322 bluetooth_.reset(new WebBluetoothImpl(GetServiceRegistry()));
4323 bluetooth_.reset(new WebBluetoothImpl(
4324 GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(),
4325 routing_id_));
4326 } 4323 }
4327
4328 return bluetooth_.get(); 4324 return bluetooth_.get();
4329 } 4325 }
4330 4326
4331 void RenderFrameImpl::didSerializeDataForFrame( 4327 void RenderFrameImpl::didSerializeDataForFrame(
4332 const WebCString& data, 4328 const WebCString& data,
4333 WebFrameSerializerClient::FrameSerializationStatus status) { 4329 WebFrameSerializerClient::FrameSerializationStatus status) {
4334 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished; 4330 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished;
4335 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse( 4331 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse(
4336 routing_id_, data, end_of_data)); 4332 routing_id_, data, end_of_data));
4337 } 4333 }
(...skipping 1793 matching lines...) Expand 10 before | Expand all | Expand 10 after
6131 // event target. Potentially a Pepper plugin will receive the event. 6127 // event target. Potentially a Pepper plugin will receive the event.
6132 // In order to tell whether a plugin gets the last mouse event and which it 6128 // In order to tell whether a plugin gets the last mouse event and which it
6133 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6129 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6134 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6130 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6135 // |pepper_last_mouse_event_target_|. 6131 // |pepper_last_mouse_event_target_|.
6136 pepper_last_mouse_event_target_ = nullptr; 6132 pepper_last_mouse_event_target_ = nullptr;
6137 #endif 6133 #endif
6138 } 6134 }
6139 6135
6140 } // namespace content 6136 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698