| 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" |
| 11 #include "content/public/browser/interstitial_page_delegate.h" | 11 #include "content/public/browser/interstitial_page_delegate.h" |
| 12 #include "content/public/browser/navigation_controller.h" | 12 #include "content/public/browser/navigation_controller.h" |
| 13 #include "content/public/browser/navigation_details.h" | 13 #include "content/public/browser/navigation_details.h" |
| 14 #include "content/public/browser/navigation_entry.h" | 14 #include "content/public/browser/navigation_entry.h" |
| 15 #include "content/public/browser/notification_details.h" | 15 #include "content/public/browser/notification_details.h" |
| 16 #include "content/public/browser/notification_source.h" | 16 #include "content/public/browser/notification_source.h" |
| 17 #include "content/public/browser/notification_types.h" | 17 #include "content/public/browser/notification_types.h" |
| 18 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
| 19 #include "services/service_manager/public/cpp/connector.h" | 19 #include "services/service_manager/public/cpp/connector.h" |
| 20 #include "ui/aura/mus/window_tree_client.h" | 20 #include "ui/aura/mus/window_tree_client.h" |
| 21 #include "ui/aura/mus/window_tree_host_mus.h" | 21 #include "ui/aura/mus/window_tree_host_mus.h" |
| 22 #include "ui/views/controls/webview/webview.h" | 22 #include "ui/views/controls/webview/webview.h" |
| 23 #include "ui/views/mus/native_widget_mus.h" | |
| 24 #include "ui/views/widget/widget.h" | 23 #include "ui/views/widget/widget.h" |
| 25 #include "url/gurl.h" | 24 #include "url/gurl.h" |
| 26 | 25 |
| 27 namespace navigation { | 26 namespace navigation { |
| 28 namespace { | 27 namespace { |
| 29 | 28 |
| 30 class InterstitialPageDelegate : public content::InterstitialPageDelegate { | 29 class InterstitialPageDelegate : public content::InterstitialPageDelegate { |
| 31 public: | 30 public: |
| 32 explicit InterstitialPageDelegate(const std::string& html) : html_(html) {} | 31 explicit InterstitialPageDelegate(const std::string& html) : html_(html) {} |
| 33 ~InterstitialPageDelegate() override {} | 32 ~InterstitialPageDelegate() override {} |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 | 316 |
| 318 views::Widget* ViewImpl::GetWidget() { | 317 views::Widget* ViewImpl::GetWidget() { |
| 319 return web_view_->GetWidget(); | 318 return web_view_->GetWidget(); |
| 320 } | 319 } |
| 321 | 320 |
| 322 const views::Widget* ViewImpl::GetWidget() const { | 321 const views::Widget* ViewImpl::GetWidget() const { |
| 323 return web_view_->GetWidget(); | 322 return web_view_->GetWidget(); |
| 324 } | 323 } |
| 325 | 324 |
| 326 } // navigation | 325 } // navigation |
| OLD | NEW |