Don't display drop down arrows in rAc dialog unless there is a suggestion

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 669 matching lines @@
     case ADDRESS_HOME_COUNTRY:
       return &country_combobox_model_;
 
     default:
       return NULL;
   }
 }
 
 ui::MenuModel* AutofillDialogControllerImpl::MenuModelForSection(
     DialogSection section) {
+  SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
+  // The shipping section menu is special. It will always show because there is
+  // a choice between "Use billing" and "enter new".
+  if (section == SECTION_SHIPPING)
+    return model;
+
+  // For other sections, only show a menu if there's at least one suggestion.
+  for (int i = 0; i < model->GetItemCount(); ++i) {
+    if (IsASuggestionItemKey(model->GetItemKeyAt(i)))
+      return model;
+  }
+
+  return NULL;
+}
+
+#if defined(OS_ANDROID)
+ui::MenuModel* AutofillDialogControllerImpl::MenuModelForSectionHack(
+    DialogSection section) {
   return SuggestionsMenuModelForSection(section);
 }
+#endif
 
 ui::MenuModel* AutofillDialogControllerImpl::MenuModelForAccountChooser() {
   // If there were unrecoverable Wallet errors, or if there are choices other
   // than "Pay without the wallet", show the full menu.
   if (account_chooser_model_.had_wallet_error() ||
       account_chooser_model_.HasAccountsToChoose()) {
     return &account_chooser_model_;
   }
 
   // Otherwise, there is no menu, just a sign in link.
@@ skipping 1669 matching lines @@
       url,
       content::PAGE_TRANSITION_AUTO_BOOKMARK);
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
 #else
   // TODO(estade): use TabModelList?
 #endif
 }
 
 }  // namespace autofill