Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 349 if (!view) | 349 if (!view) |
| 350 return NULL; | 350 return NULL; |
| 351 return view->GetNativeView(); | 351 return view->GetNativeView(); |
| 352 } | 352 } |
| 353 | 353 |
| 354 void RenderFrameHostImpl::AddMessageToConsole(ConsoleMessageLevel level, | 354 void RenderFrameHostImpl::AddMessageToConsole(ConsoleMessageLevel level, |
| 355 const std::string& message) { | 355 const std::string& message) { |
| 356 Send(new FrameMsg_AddMessageToConsole(routing_id_, level, message)); | 356 Send(new FrameMsg_AddMessageToConsole(routing_id_, level, message)); |
| 357 } | 357 } |
| 358 | 358 |
| 359 void RenderFrameHostImpl::AddSecurityMessageToConsole( | |
|
pfeldman
2016/04/21 21:48:30
We already have one above.
| |
| 360 ConsoleMessageLevel level, | |
| 361 const std::string& message) { | |
| 362 Send(new FrameMsg_AddSecurityMessageToConsole(routing_id_, level, message)); | |
| 363 } | |
| 364 | |
| 359 void RenderFrameHostImpl::ExecuteJavaScript( | 365 void RenderFrameHostImpl::ExecuteJavaScript( |
| 360 const base::string16& javascript) { | 366 const base::string16& javascript) { |
| 361 CHECK(CanExecuteJavaScript()); | 367 CHECK(CanExecuteJavaScript()); |
| 362 Send(new FrameMsg_JavaScriptExecuteRequest(routing_id_, | 368 Send(new FrameMsg_JavaScriptExecuteRequest(routing_id_, |
| 363 javascript, | 369 javascript, |
| 364 0, false)); | 370 0, false)); |
| 365 } | 371 } |
| 366 | 372 |
| 367 void RenderFrameHostImpl::ExecuteJavaScript( | 373 void RenderFrameHostImpl::ExecuteJavaScript( |
| 368 const base::string16& javascript, | 374 const base::string16& javascript, |
| (...skipping 2403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2772 // handler after it's destroyed so it can't run after the RFHI is destroyed. | 2778 // handler after it's destroyed so it can't run after the RFHI is destroyed. |
| 2773 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 2779 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
| 2774 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 2780 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
| 2775 } | 2781 } |
| 2776 | 2782 |
| 2777 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 2783 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
| 2778 web_bluetooth_service_.reset(); | 2784 web_bluetooth_service_.reset(); |
| 2779 } | 2785 } |
| 2780 | 2786 |
| 2781 } // namespace content | 2787 } // namespace content |
| OLD | NEW |