Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Side by Side Diff: content/browser/web_contents/web_contents_view_android.cc

Issue 197533008: Mac: ExternalPopupMenu::close should hide a showing popup menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test fix Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 int selected_item, 182 int selected_item,
183 const std::vector<MenuItem>& items, 183 const std::vector<MenuItem>& items,
184 bool right_aligned, 184 bool right_aligned,
185 bool allow_multiple_selection) { 185 bool allow_multiple_selection) {
186 if (content_view_core_) { 186 if (content_view_core_) {
187 content_view_core_->ShowSelectPopupMenu( 187 content_view_core_->ShowSelectPopupMenu(
188 items, selected_item, allow_multiple_selection); 188 items, selected_item, allow_multiple_selection);
189 } 189 }
190 } 190 }
191 191
192 void WebContentsViewAndroid::HidePopupMenu() {
193 // TODO(tkent): implement
194 }
195
192 void WebContentsViewAndroid::StartDragging( 196 void WebContentsViewAndroid::StartDragging(
193 const DropData& drop_data, 197 const DropData& drop_data,
194 blink::WebDragOperationsMask allowed_ops, 198 blink::WebDragOperationsMask allowed_ops,
195 const gfx::ImageSkia& image, 199 const gfx::ImageSkia& image,
196 const gfx::Vector2d& image_offset, 200 const gfx::Vector2d& image_offset,
197 const DragEventSourceInfo& event_info) { 201 const DragEventSourceInfo& event_info) {
198 NOTIMPLEMENTED(); 202 NOTIMPLEMENTED();
199 } 203 }
200 204
201 void WebContentsViewAndroid::UpdateDragCursor(blink::WebDragOperation op) { 205 void WebContentsViewAndroid::UpdateDragCursor(blink::WebDragOperation op) {
202 NOTIMPLEMENTED(); 206 NOTIMPLEMENTED();
203 } 207 }
204 208
205 void WebContentsViewAndroid::GotFocus() { 209 void WebContentsViewAndroid::GotFocus() {
206 // This is only used in the views FocusManager stuff but it bleeds through 210 // This is only used in the views FocusManager stuff but it bleeds through
207 // all subclasses. http://crbug.com/21875 211 // all subclasses. http://crbug.com/21875
208 } 212 }
209 213
210 // This is called when we the renderer asks us to take focus back (i.e., it has 214 // This is called when we the renderer asks us to take focus back (i.e., it has
211 // iterated past the last focusable element on the page). 215 // iterated past the last focusable element on the page).
212 void WebContentsViewAndroid::TakeFocus(bool reverse) { 216 void WebContentsViewAndroid::TakeFocus(bool reverse) {
213 if (web_contents_->GetDelegate() && 217 if (web_contents_->GetDelegate() &&
214 web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse)) 218 web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
215 return; 219 return;
216 web_contents_->GetRenderWidgetHostView()->Focus(); 220 web_contents_->GetRenderWidgetHostView()->Focus();
217 } 221 }
218 222
219 } // namespace content 223 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_android.h ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698