Combobox: Rename styles to STYLE_NORMAL and STYLE_ACTION and modify behaviors

chrome/browser/ui/views/translate/translate_bubble_view.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/views/translate/translate_bubble_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 250 matching lines @@
 gfx::Size TranslateBubbleView::GetPreferredSize() {
   int width = 0;
   for (int i = 0; i < child_count(); i++) {
     views::View* child = child_at(i);
     width = std::max(width, child->GetPreferredSize().width());
   }
   int height = GetCurrentView()->GetPreferredSize().height();
   return gfx::Size(width, height);
 }
 
-void TranslateBubbleView::OnSelectedIndexChanged(views::Combobox* combobox) {
-  HandleComboboxSelectedIndexChanged(static_cast<ComboboxID>(combobox->id()));
-}
-
-void TranslateBubbleView::OnComboboxTextButtonClicked(
-    views::Combobox* combobox) {
-  if (combobox != denial_combobox_)
-    return;
-
-  denial_button_clicked_ = true;
-  int index = combobox->selected_index();
-  switch (index) {
-    case TranslateDenialComboboxModel::INDEX_NOPE:
-      break;
-    case TranslateDenialComboboxModel::INDEX_NEVER_TRANSLATE_LANGUAGE:
-      model_->SetNeverTranslateLanguage(true);
-      break;
-    case TranslateDenialComboboxModel::INDEX_NEVER_TRANSLATE_SITE:
-      model_->SetNeverTranslateSite(true);
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-  StartFade(false);
+void TranslateBubbleView::OnPerformAction(views::Combobox* combobox) {
+  HandleComboboxPerformAction(static_cast<ComboboxID>(combobox->id()));
 }
 
 void TranslateBubbleView::LinkClicked(views::Link* source, int event_flags) {
   HandleLinkClicked(static_cast<LinkID>(source->id()));
 }
 
 void TranslateBubbleView::WebContentsDestroyed(
     content::WebContents* web_contents) {
   GetWidget()->CloseNow();
 }
@@ skipping 115 matching lines @@
           GURL(url),
           content::Referrer(),
           NEW_FOREGROUND_TAB,
           content::PAGE_TRANSITION_LINK,
           false));
       break;
     }
   }
 }
 
-void TranslateBubbleView::HandleComboboxSelectedIndexChanged(
+void TranslateBubbleView::HandleComboboxPerformAction(
     TranslateBubbleView::ComboboxID sender_id) {
   switch (sender_id) {
     case COMBOBOX_ID_DENIAL: {
-      // do nothing
+      denial_button_clicked_ = true;
+      int index = denial_combobox_->selected_index();
+      switch (index) {
+        case TranslateDenialComboboxModel::INDEX_NOPE:
+          break;
+        case TranslateDenialComboboxModel::INDEX_NEVER_TRANSLATE_LANGUAGE:
+          model_->SetNeverTranslateLanguage(true);
+          break;
+        case TranslateDenialComboboxModel::INDEX_NEVER_TRANSLATE_SITE:
+          model_->SetNeverTranslateSite(true);
+          break;
+        default:
+          NOTREACHED();
+          break;
+      }
+      StartFade(false);
       break;
     }
     case COMBOBOX_ID_SOURCE_LANGUAGE: {
       if (model_->GetOriginalLanguageIndex() ==
           source_language_combobox_->selected_index()) {
         break;
       }
       model_->UpdateOriginalLanguageIndex(
           source_language_combobox_->selected_index());
       UpdateAdvancedView();
@@ skipping 22 matching lines @@
 views::View* TranslateBubbleView::CreateViewBeforeTranslate() {
   views::Label* message_label = new views::Label(
       l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_BEFORE_TRANSLATE));
 
   base::string16 original_language_name =
       model_->GetLanguageNameAt(model_->GetOriginalLanguageIndex());
   denial_combobox_ = new views::Combobox(
       new TranslateDenialComboboxModel(original_language_name));
   denial_combobox_->set_id(COMBOBOX_ID_DENIAL);
   denial_combobox_->set_listener(this);
-  denial_combobox_->SetStyle(views::Combobox::STYLE_NOTIFY_ON_CLICK);
+  denial_combobox_->SetStyle(views::Combobox::STYLE_ACTION);
 
   views::View* view = new views::View();
   views::GridLayout* layout = new views::GridLayout(view);
   view->SetLayoutManager(layout);
 
   using views::GridLayout;
 
   enum {
     COLUMN_SET_ID_MESSAGE,
     COLUMN_SET_ID_CONTENT,
@@ skipping 301 matching lines @@
         model_->ShouldAlwaysTranslate());
   }
 
   base::string16 label;
   if (model_->IsPageTranslatedInCurrentLanguages())
     label = l10n_util::GetStringUTF16(IDS_DONE);
   else
     label = l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT);
   advanced_done_button_->SetText(label);
 }