| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/navigation/view_impl.h" | 5 #include "services/navigation/view_impl.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "content/public/browser/browser_context.h" | 9 #include "content/public/browser/browser_context.h" |
| 10 #include "content/public/browser/interstitial_page.h" | 10 #include "content/public/browser/interstitial_page.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 : content::ReloadType::NORMAL, | 114 : content::ReloadType::NORMAL, |
| 115 true); | 115 true); |
| 116 } | 116 } |
| 117 | 117 |
| 118 void ViewImpl::Stop() { | 118 void ViewImpl::Stop() { |
| 119 web_view_->GetWebContents()->Stop(); | 119 web_view_->GetWebContents()->Stop(); |
| 120 } | 120 } |
| 121 | 121 |
| 122 void ViewImpl::GetWindowTreeClient(ui::mojom::WindowTreeClientRequest request) { | 122 void ViewImpl::GetWindowTreeClient(ui::mojom::WindowTreeClientRequest request) { |
| 123 window_tree_client_ = base::MakeUnique<aura::WindowTreeClient>( | 123 window_tree_client_ = base::MakeUnique<aura::WindowTreeClient>( |
| 124 connector_.get(), this, nullptr, std::move(request)); | 124 connector_.get(), nullptr, this, nullptr, std::move(request)); |
| 125 } | 125 } |
| 126 | 126 |
| 127 void ViewImpl::ShowInterstitial(const std::string& html) { | 127 void ViewImpl::ShowInterstitial(const std::string& html) { |
| 128 content::InterstitialPage* interstitial = | 128 content::InterstitialPage* interstitial = |
| 129 content::InterstitialPage::Create(web_view_->GetWebContents(), | 129 content::InterstitialPage::Create(web_view_->GetWebContents(), |
| 130 false, | 130 false, |
| 131 GURL(), | 131 GURL(), |
| 132 new InterstitialPageDelegate(html)); | 132 new InterstitialPageDelegate(html)); |
| 133 interstitial->Show(); | 133 interstitial->Show(); |
| 134 } | 134 } |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 | 316 |
| 317 views::Widget* ViewImpl::GetWidget() { | 317 views::Widget* ViewImpl::GetWidget() { |
| 318 return web_view_->GetWidget(); | 318 return web_view_->GetWidget(); |
| 319 } | 319 } |
| 320 | 320 |
| 321 const views::Widget* ViewImpl::GetWidget() const { | 321 const views::Widget* ViewImpl::GetWidget() const { |
| 322 return web_view_->GetWidget(); | 322 return web_view_->GetWidget(); |
| 323 } | 323 } |
| 324 | 324 |
| 325 } // navigation | 325 } // navigation |
| OLD | NEW |