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/frame_host/interstitial_page_impl.h" |
10 #include "content/browser/media/android/browser_media_player_manager.h" | 10 #include "content/browser/media/android/browser_media_player_manager.h" |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 void WebContentsViewAndroid::RenderViewCreated(RenderViewHost* host) { | 171 void WebContentsViewAndroid::RenderViewCreated(RenderViewHost* host) { |
172 } | 172 } |
173 | 173 |
174 void WebContentsViewAndroid::RenderViewSwappedIn(RenderViewHost* host) { | 174 void WebContentsViewAndroid::RenderViewSwappedIn(RenderViewHost* host) { |
175 } | 175 } |
176 | 176 |
177 void WebContentsViewAndroid::SetOverscrollControllerEnabled(bool enabled) { | 177 void WebContentsViewAndroid::SetOverscrollControllerEnabled(bool enabled) { |
178 } | 178 } |
179 | 179 |
180 void WebContentsViewAndroid::ShowContextMenu( | 180 void WebContentsViewAndroid::ShowContextMenu( |
181 const ContextMenuParams& params) { | 181 RenderFrameHost* render_frame_host, const ContextMenuParams& params) { |
182 if (delegate_) | 182 if (delegate_) |
183 delegate_->ShowContextMenu(params); | 183 delegate_->ShowContextMenu(render_frame_host, params); |
184 } | 184 } |
185 | 185 |
186 void WebContentsViewAndroid::ShowPopupMenu( | 186 void WebContentsViewAndroid::ShowPopupMenu( |
187 const gfx::Rect& bounds, | 187 const gfx::Rect& bounds, |
188 int item_height, | 188 int item_height, |
189 double item_font_size, | 189 double item_font_size, |
190 int selected_item, | 190 int selected_item, |
191 const std::vector<MenuItem>& items, | 191 const std::vector<MenuItem>& items, |
192 bool right_aligned, | 192 bool right_aligned, |
193 bool allow_multiple_selection) { | 193 bool allow_multiple_selection) { |
(...skipping 24 matching lines...) Expand all 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 |