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

Unified Diff: content/renderer/external_popup_menu.cc

Issue 1992393002: Enable external popup menu in Blimp, part 1/2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and update blimp_engine.gn Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/external_popup_menu.h ('k') | content/renderer/render_frame_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/external_popup_menu.cc
diff --git a/content/renderer/external_popup_menu.cc b/content/renderer/external_popup_menu.cc
index 7bb01a1d32036ba35ac23e33a8128710868106ac..95b41a757e61d1acf0dbc6deaa99c0eaa188a970 100644
--- a/content/renderer/external_popup_menu.cc
+++ b/content/renderer/external_popup_menu.cc
@@ -63,6 +63,7 @@ void ExternalPopupMenu::close() {
// |this| was deleted.
}
+#if defined(USE_EXTERNAL_POPUP_MENU)
#if defined(OS_MACOSX)
void ExternalPopupMenu::DidSelectItem(int index) {
if (!popup_menu_client_)
@@ -72,9 +73,7 @@ void ExternalPopupMenu::DidSelectItem(int index) {
else
popup_menu_client_->didAcceptIndex(index);
}
-#endif
-
-#if defined(OS_ANDROID)
+#else
void ExternalPopupMenu::DidSelectItems(bool canceled,
const std::vector<int>& indices) {
if (!popup_menu_client_)
@@ -85,5 +84,6 @@ void ExternalPopupMenu::DidSelectItems(bool canceled,
popup_menu_client_->didAcceptIndices(indices);
}
#endif
+#endif
} // namespace content
« no previous file with comments | « content/renderer/external_popup_menu.h ('k') | content/renderer/render_frame_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698