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

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: Merge 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 4363 matching lines...) Expand 10 before | Expand all | Expand 10 after
4374 const WebURL& url) { 4374 const WebURL& url) {
4375 bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture(); 4375 bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture();
4376 Send(new FrameHostMsg_UnregisterProtocolHandler( 4376 Send(new FrameHostMsg_UnregisterProtocolHandler(
4377 routing_id_, 4377 routing_id_,
4378 base::UTF16ToUTF8(base::StringPiece16(scheme)), 4378 base::UTF16ToUTF8(base::StringPiece16(scheme)),
4379 url, 4379 url,
4380 user_gesture)); 4380 user_gesture));
4381 } 4381 }
4382 4382
4383 blink::WebBluetooth* RenderFrameImpl::bluetooth() { 4383 blink::WebBluetooth* RenderFrameImpl::bluetooth() {
4384 // ChildThreadImpl::current() is null in some tests. 4384 if (!bluetooth_.get()) {
4385 if (!bluetooth_ && ChildThreadImpl::current()) { 4385 bluetooth_.reset(new WebBluetoothImpl(GetServiceRegistry()));
4386 bluetooth_.reset(new WebBluetoothImpl(
4387 GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(),
4388 routing_id_));
4389 } 4386 }
4390
4391 return bluetooth_.get(); 4387 return bluetooth_.get();
4392 } 4388 }
4393 4389
4394 void RenderFrameImpl::didSerializeDataForFrame( 4390 void RenderFrameImpl::didSerializeDataForFrame(
4395 const WebCString& data, 4391 const WebCString& data,
4396 WebFrameSerializerClient::FrameSerializationStatus status) { 4392 WebFrameSerializerClient::FrameSerializationStatus status) {
4397 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished; 4393 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished;
4398 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse( 4394 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse(
4399 routing_id_, data, end_of_data)); 4395 routing_id_, data, end_of_data));
4400 } 4396 }
(...skipping 1803 matching lines...) Expand 10 before | Expand all | Expand 10 after
6204 // event target. Potentially a Pepper plugin will receive the event. 6200 // event target. Potentially a Pepper plugin will receive the event.
6205 // In order to tell whether a plugin gets the last mouse event and which it 6201 // In order to tell whether a plugin gets the last mouse event and which it
6206 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6202 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6207 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6203 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6208 // |pepper_last_mouse_event_target_|. 6204 // |pepper_last_mouse_event_target_|.
6209 pepper_last_mouse_event_target_ = nullptr; 6205 pepper_last_mouse_event_target_ = nullptr;
6210 #endif 6206 #endif
6211 } 6207 }
6212 6208
6213 } // namespace content 6209 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698