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/interstitial_page_impl.h" | 5 #include "content/browser/frame_host/interstitial_page_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 11 matching lines...) Expand all Loading... | |
22 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 22 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
23 #include "content/browser/frame_host/interstitial_page_navigator_impl.h" | 23 #include "content/browser/frame_host/interstitial_page_navigator_impl.h" |
24 #include "content/browser/frame_host/navigation_controller_impl.h" | 24 #include "content/browser/frame_host/navigation_controller_impl.h" |
25 #include "content/browser/frame_host/navigation_entry_impl.h" | 25 #include "content/browser/frame_host/navigation_entry_impl.h" |
26 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 26 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
27 #include "content/browser/renderer_host/render_process_host_impl.h" | 27 #include "content/browser/renderer_host/render_process_host_impl.h" |
28 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 28 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
29 #include "content/browser/renderer_host/render_view_host_factory.h" | 29 #include "content/browser/renderer_host/render_view_host_factory.h" |
30 #include "content/browser/renderer_host/render_view_host_impl.h" | 30 #include "content/browser/renderer_host/render_view_host_impl.h" |
31 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 31 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
32 #include "content/browser/renderer_host/text_input_manager.h" | |
32 #include "content/browser/site_instance_impl.h" | 33 #include "content/browser/site_instance_impl.h" |
33 #include "content/browser/web_contents/web_contents_impl.h" | 34 #include "content/browser/web_contents/web_contents_impl.h" |
34 #include "content/browser/web_contents/web_contents_view.h" | 35 #include "content/browser/web_contents/web_contents_view.h" |
35 #include "content/common/frame_messages.h" | 36 #include "content/common/frame_messages.h" |
36 #include "content/common/input_messages.h" | 37 #include "content/common/input_messages.h" |
37 #include "content/common/view_messages.h" | 38 #include "content/common/view_messages.h" |
38 #include "content/public/browser/browser_context.h" | 39 #include "content/public/browser/browser_context.h" |
39 #include "content/public/browser/browser_thread.h" | 40 #include "content/public/browser/browser_thread.h" |
40 #include "content/public/browser/content_browser_client.h" | 41 #include "content/public/browser/content_browser_client.h" |
41 #include "content/public/browser/interstitial_page_delegate.h" | 42 #include "content/public/browser/interstitial_page_delegate.h" |
(...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
930 | 931 |
931 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( | 932 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( |
932 const LoadCommittedDetails& load_details) { | 933 const LoadCommittedDetails& load_details) { |
933 interstitial_->OnNavigatingAwayOrTabClosing(); | 934 interstitial_->OnNavigatingAwayOrTabClosing(); |
934 } | 935 } |
935 | 936 |
936 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { | 937 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { |
937 interstitial_->OnNavigatingAwayOrTabClosing(); | 938 interstitial_->OnNavigatingAwayOrTabClosing(); |
938 } | 939 } |
939 | 940 |
941 TextInputManager* InterstitialPageImpl::GetTextInputManager() { | |
942 if (GetWebContents()) | |
943 return static_cast<WebContentsImpl*>(web_contents_)->GetTextInputManager(); | |
944 | |
945 return RenderWidgetHostDelegate::GetTextInputManager(); | |
Charlie Reis
2016/05/18 20:46:03
I think it's clearer to just return nullptr in thi
EhsanK
2016/05/24 20:42:44
Done.
| |
946 } | |
947 | |
940 } // namespace content | 948 } // namespace content |
OLD | NEW |