Update location bar bubble/icon behavior.

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 60 matching lines @@
   // removing the child views is needed.
   RemoveAllChildViews(true);
 }
 
 // static
 void TranslateBubbleView::ShowBubble(
     views::View* anchor_view,
     content::WebContents* web_contents,
     translate::TranslateStep step,
     translate::TranslateErrors::Type error_type,
-    bool is_user_gesture) {
+    DisplayReason reason) {
   if (translate_bubble_view_) {
     // When the user reads the advanced setting panel, the bubble should not be
     // changed because they are focusing on the bubble.
     if (translate_bubble_view_->web_contents() == web_contents &&
         translate_bubble_view_->model()->GetViewState() ==
         TranslateBubbleModel::VIEW_STATE_ADVANCED) {
       return;
     }
     if (step != translate::TRANSLATE_STEP_TRANSLATE_ERROR) {
       TranslateBubbleModel::ViewState state =
           TranslateBubbleModelImpl::TranslateStepToViewState(step);
       translate_bubble_view_->SwitchView(state);
     } else {
       translate_bubble_view_->SwitchToErrorView(error_type);
     }
     return;
   } else {
     if (step == translate::TRANSLATE_STEP_AFTER_TRANSLATE &&
-        !is_user_gesture) {
+        reason == AUTOMATIC) {
       return;
     }
   }
 
   std::string source_language;
   std::string target_language;
   ChromeTranslateClient::GetTranslateLanguages(
       web_contents, &source_language, &target_language);
 
   scoped_ptr<translate::TranslateUIDelegate> ui_delegate(
       new translate::TranslateUIDelegate(
           ChromeTranslateClient::GetManagerFromWebContents(web_contents)
               ->GetWeakPtr(),
           source_language,
           target_language));
   scoped_ptr<TranslateBubbleModel> model(
       new TranslateBubbleModelImpl(step, ui_delegate.Pass()));
   TranslateBubbleView* view = new TranslateBubbleView(anchor_view,
                                                       model.Pass(),
                                                       error_type,
                                                       web_contents);
-  if (is_user_gesture)
-    views::BubbleDelegateView::CreateBubble(view)->Show();
-  else
-    views::BubbleDelegateView::CreateBubble(view)->ShowInactive();
+  views::BubbleDelegateView::CreateBubble(view);
+  view->ShowForReason(reason);
 }
 
 // static
 void TranslateBubbleView::CloseBubble() {
   if (!translate_bubble_view_)
     return;
 
   translate_bubble_view_->GetWidget()->Close();
 }
 
@@ skipping 620 matching lines @@
   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);
   advanced_done_button_->SizeToPreferredSize();
   if (advanced_view_)
     advanced_view_->Layout();
 }