OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/web_contents/web_contents_view_android.h" | 5 #include "content/browser/web_contents/web_contents_view_android.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/browser/android/content_view_core_impl.h" | 8 #include "content/browser/android/content_view_core_impl.h" |
| 9 #include "content/browser/frame_host/interstitial_page_impl.h" |
9 #include "content/browser/media/android/browser_media_player_manager.h" | 10 #include "content/browser/media/android/browser_media_player_manager.h" |
10 #include "content/browser/renderer_host/render_widget_host_view_android.h" | 11 #include "content/browser/renderer_host/render_widget_host_view_android.h" |
11 #include "content/browser/renderer_host/render_view_host_factory.h" | 12 #include "content/browser/renderer_host/render_view_host_factory.h" |
12 #include "content/browser/renderer_host/render_view_host_impl.h" | 13 #include "content/browser/renderer_host/render_view_host_impl.h" |
13 #include "content/browser/web_contents/interstitial_page_impl.h" | |
14 #include "content/browser/web_contents/web_contents_impl.h" | 14 #include "content/browser/web_contents/web_contents_impl.h" |
15 #include "content/public/browser/web_contents_delegate.h" | 15 #include "content/public/browser/web_contents_delegate.h" |
16 | 16 |
17 namespace content { | 17 namespace content { |
18 WebContentsViewPort* CreateWebContentsView( | 18 WebContentsViewPort* CreateWebContentsView( |
19 WebContentsImpl* web_contents, | 19 WebContentsImpl* web_contents, |
20 WebContentsViewDelegate* delegate, | 20 WebContentsViewDelegate* delegate, |
21 RenderViewHostDelegateView** render_view_host_delegate_view) { | 21 RenderViewHostDelegateView** render_view_host_delegate_view) { |
22 WebContentsViewAndroid* rv = new WebContentsViewAndroid( | 22 WebContentsViewAndroid* rv = new WebContentsViewAndroid( |
23 web_contents, delegate); | 23 web_contents, delegate); |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 // This is called when we the renderer asks us to take focus back (i.e., it has | 218 // This is called when we the renderer asks us to take focus back (i.e., it has |
219 // iterated past the last focusable element on the page). | 219 // iterated past the last focusable element on the page). |
220 void WebContentsViewAndroid::TakeFocus(bool reverse) { | 220 void WebContentsViewAndroid::TakeFocus(bool reverse) { |
221 if (web_contents_->GetDelegate() && | 221 if (web_contents_->GetDelegate() && |
222 web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse)) | 222 web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse)) |
223 return; | 223 return; |
224 web_contents_->GetRenderWidgetHostView()->Focus(); | 224 web_contents_->GetRenderWidgetHostView()->Focus(); |
225 } | 225 } |
226 | 226 |
227 } // namespace content | 227 } // namespace content |
OLD | NEW |