| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 } | 102 } |
| 103 | 103 |
| 104 void ViewImpl::GoForward() { | 104 void ViewImpl::GoForward() { |
| 105 web_view_->GetWebContents()->GetController().GoForward(); | 105 web_view_->GetWebContents()->GetController().GoForward(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 void ViewImpl::NavigateToOffset(int offset) { | 108 void ViewImpl::NavigateToOffset(int offset) { |
| 109 web_view_->GetWebContents()->GetController().GoToOffset(offset); | 109 web_view_->GetWebContents()->GetController().GoToOffset(offset); |
| 110 } | 110 } |
| 111 | 111 |
| 112 void ViewImpl::Reload(bool skip_cache) { | 112 void ViewImpl::Reload(bool bypass_cache) { |
| 113 if (skip_cache) | 113 web_view_->GetWebContents()->GetController().Reload( |
| 114 web_view_->GetWebContents()->GetController().Reload(true); | 114 bypass_cache ? content::ReloadType::BYPASSING_CACHE |
| 115 else | 115 : content::ReloadType::NORMAL, |
| 116 web_view_->GetWebContents()->GetController().ReloadBypassingCache(true); | 116 true); |
| 117 } | 117 } |
| 118 | 118 |
| 119 void ViewImpl::Stop() { | 119 void ViewImpl::Stop() { |
| 120 web_view_->GetWebContents()->Stop(); | 120 web_view_->GetWebContents()->Stop(); |
| 121 } | 121 } |
| 122 | 122 |
| 123 void ViewImpl::GetWindowTreeClient(ui::mojom::WindowTreeClientRequest request) { | 123 void ViewImpl::GetWindowTreeClient(ui::mojom::WindowTreeClientRequest request) { |
| 124 window_tree_client_ = base::MakeUnique<aura::WindowTreeClient>( | 124 window_tree_client_ = base::MakeUnique<aura::WindowTreeClient>( |
| 125 connector_.get(), this, nullptr, std::move(request)); | 125 connector_.get(), this, nullptr, std::move(request)); |
| 126 } | 126 } |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 | 317 |
| 318 views::Widget* ViewImpl::GetWidget() { | 318 views::Widget* ViewImpl::GetWidget() { |
| 319 return web_view_->GetWidget(); | 319 return web_view_->GetWidget(); |
| 320 } | 320 } |
| 321 | 321 |
| 322 const views::Widget* ViewImpl::GetWidget() const { | 322 const views::Widget* ViewImpl::GetWidget() const { |
| 323 return web_view_->GetWidget(); | 323 return web_view_->GetWidget(); |
| 324 } | 324 } |
| 325 | 325 |
| 326 } // navigation | 326 } // navigation |
| OLD | NEW |