Chromium Code Reviews| Index: content/renderer/external_popup_menu.cc |
| diff --git a/content/renderer/external_popup_menu.cc b/content/renderer/external_popup_menu.cc |
| index a8c1ea852b37e48763c4056122be2505d74d0c7d..fcdcd5a0268d7f7fb83a3b55e8597b85c2692c4e 100644 |
| --- a/content/renderer/external_popup_menu.cc |
| +++ b/content/renderer/external_popup_menu.cc |
| @@ -1,4 +1,4 @@ |
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| @@ -27,6 +27,8 @@ void ExternalPopupMenu::show(const WebKit::WebRect& bounds) { |
| for (size_t i = 0; i < popup_menu_info_.items.size(); ++i) |
| popup_params.popup_items.push_back(WebMenuItem(popup_menu_info_.items[i])); |
| popup_params.right_aligned = popup_menu_info_.rightAligned; |
| + popup_params.allow_multiple_selection = |
| + popup_menu_info_.allowMultipleSelection; |
| render_view_->Send( |
| new ViewHostMsg_ShowPopup(render_view_->routing_id(), popup_params)); |
| } |
| @@ -44,3 +46,14 @@ void ExternalPopupMenu::DidSelectItem(int index) { |
| else |
| popup_menu_client_->didAcceptIndex(index); |
| } |
|
Avi (use Gerrit)
2012/05/24 18:41:41
ditto platform mark. Plus, blank line please befor
aruslan
2012/05/24 19:53:15
Done.
|
| +#if defined(OS_ANDROID) |
| +void ExternalPopupMenu::DidSelectItems(bool canceled, |
| + const std::vector<int>& indices) { |
| + if (!popup_menu_client_) |
| + return; |
| + if (canceled) |
| + popup_menu_client_->didCancel(); |
| + else |
| + popup_menu_client_->didAcceptIndices(indices); |
| +} |
| +#endif |