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

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

Issue 10436010: Multi-select <select> in 'external popup window' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase after reverts and re-reverts.. Created 8 years, 7 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_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "content/browser/renderer_host/render_view_host_factory.h" 8 #include "content/browser/renderer_host/render_view_host_factory.h"
9 #include "content/browser/web_contents/interstitial_page_impl.h" 9 #include "content/browser/web_contents/interstitial_page_impl.h"
10 #include "content/browser/web_contents/web_contents_impl.h" 10 #include "content/browser/web_contents/web_contents_impl.h"
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 395
396 //////////////////////////////////////////////////////////////////////////////// 396 ////////////////////////////////////////////////////////////////////////////////
397 // WebContentsViewAura, RenderViewHostDelegateView implementation: 397 // WebContentsViewAura, RenderViewHostDelegateView implementation:
398 398
399 void WebContentsViewAura::ShowContextMenu( 399 void WebContentsViewAura::ShowContextMenu(
400 const content::ContextMenuParams& params) { 400 const content::ContextMenuParams& params) {
401 if (delegate_.get()) 401 if (delegate_.get())
402 delegate_->ShowContextMenu(params); 402 delegate_->ShowContextMenu(params);
403 } 403 }
404 404
405 void WebContentsViewAura::ShowPopupMenu(const gfx::Rect& bounds,
406 int item_height,
407 double item_font_size,
408 int selected_item,
409 const std::vector<WebMenuItem>& items,
410 bool right_aligned,
411 bool allow_multiple_selection) {
412 // External popup menus are only used on Mac and Android.
413 NOTIMPLEMENTED();
414 }
415
405 void WebContentsViewAura::StartDragging( 416 void WebContentsViewAura::StartDragging(
406 const WebDropData& drop_data, 417 const WebDropData& drop_data,
407 WebKit::WebDragOperationsMask operations, 418 WebKit::WebDragOperationsMask operations,
408 const SkBitmap& image, 419 const SkBitmap& image,
409 const gfx::Point& image_offset) { 420 const gfx::Point& image_offset) {
410 aura::RootWindow* root_window = GetNativeView()->GetRootWindow(); 421 aura::RootWindow* root_window = GetNativeView()->GetRootWindow();
411 if (!aura::client::GetDragDropClient(root_window)) 422 if (!aura::client::GetDragDropClient(root_window))
412 return; 423 return;
413 424
414 ui::OSExchangeDataProviderAura* provider = new ui::OSExchangeDataProviderAura; 425 ui::OSExchangeDataProviderAura* provider = new ui::OSExchangeDataProviderAura;
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 OnDragEntered(event); 613 OnDragEntered(event);
603 614
604 web_contents_->GetRenderViewHost()->DragTargetDrop( 615 web_contents_->GetRenderViewHost()->DragTargetDrop(
605 event.location(), 616 event.location(),
606 GetNativeView()->GetRootWindow()->last_mouse_location(), 617 GetNativeView()->GetRootWindow()->last_mouse_location(),
607 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 618 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
608 if (drag_dest_delegate_) 619 if (drag_dest_delegate_)
609 drag_dest_delegate_->OnDrop(); 620 drag_dest_delegate_->OnDrop();
610 return current_drag_op_; 621 return current_drag_op_;
611 } 622 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698