| 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 2306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2317 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) | 2317 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) |
| 2318 OnDidStartLoading(true); | 2318 OnDidStartLoading(true); |
| 2319 } | 2319 } |
| 2320 | 2320 |
| 2321 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { | 2321 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { |
| 2322 DCHECK(data_url.SchemeIs(url::kDataScheme)); | 2322 DCHECK(data_url.SchemeIs(url::kDataScheme)); |
| 2323 CommonNavigationParams common_params( | 2323 CommonNavigationParams common_params( |
| 2324 data_url, Referrer(), ui::PAGE_TRANSITION_LINK, | 2324 data_url, Referrer(), ui::PAGE_TRANSITION_LINK, |
| 2325 FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(), | 2325 FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(), |
| 2326 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(), LOFI_OFF, | 2326 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(), LOFI_OFF, |
| 2327 base::TimeTicks::Now(), "GET", nullptr); | 2327 base::TimeTicks::Now(), "GET", false, nullptr); |
| 2328 if (IsBrowserSideNavigationEnabled()) { | 2328 if (IsBrowserSideNavigationEnabled()) { |
| 2329 CommitNavigation(nullptr, nullptr, common_params, RequestNavigationParams(), | 2329 CommitNavigation(nullptr, nullptr, common_params, RequestNavigationParams(), |
| 2330 false); | 2330 false); |
| 2331 } else { | 2331 } else { |
| 2332 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); | 2332 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); |
| 2333 } | 2333 } |
| 2334 } | 2334 } |
| 2335 | 2335 |
| 2336 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, | 2336 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, |
| 2337 SiteInstance* source_site_instance) { | 2337 SiteInstance* source_site_instance) { |
| (...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3114 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3114 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
| 3115 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3115 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
| 3116 return web_bluetooth_service_.get(); | 3116 return web_bluetooth_service_.get(); |
| 3117 } | 3117 } |
| 3118 | 3118 |
| 3119 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3119 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
| 3120 web_bluetooth_service_.reset(); | 3120 web_bluetooth_service_.reset(); |
| 3121 } | 3121 } |
| 3122 | 3122 |
| 3123 } // namespace content | 3123 } // namespace content |
| OLD | NEW |