Translate: New Bubble UX (for the view toolkit)

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 142 matching lines @@
                                                       is_in_incognito_window,
                                                       browser);
   views::BubbleDelegateView::CreateBubble(view)->Show();
 }
 
 // static
 bool TranslateBubbleView::IsShowing() {
   return translate_bubble_view_ != NULL;
 }
 
+// static
+TranslateBubbleView* TranslateBubbleView::GetCurrentBubble() {
+  return translate_bubble_view_;
+}
+
 void TranslateBubbleView::Init() {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
                                         0, 0, 0));
 
   before_translate_view_ = CreateViewBeforeTranslate();
   translating_view_ = CreateViewTranslating();
   after_translate_view_ = CreateViewAfterTranslate();
   error_view_ = CreateViewError();
   advanced_view_ = CreateViewAdvanced();
 
   AddChildView(before_translate_view_);
   AddChildView(translating_view_);
   AddChildView(after_translate_view_);
   AddChildView(error_view_);
   AddChildView(advanced_view_);
 
   AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
 
   UpdateChildVisibilities();
 }
 
 void TranslateBubbleView::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   HandleButtonPressed(static_cast<ButtonID>(sender->id()));
 }
 
 void TranslateBubbleView::WindowClosing() {
-  if (!translate_executed_)
+  if (!translate_executed_ &&
+      (browser_ == NULL || !browser_->IsAttemptingToCloseBrowser())) {
     model_->TranslationDeclined();
+  }
 
   // We have to reset |translate_bubble_view_| here, not in our destructor,
   // because we'll be destroyed asynchronously and the shown state will be
   // checked before then.
   DCHECK_EQ(translate_bubble_view_, this);
   translate_bubble_view_ = NULL;
 }
 
 bool TranslateBubbleView::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
@@ skipping 542 matching lines @@
       l10n_util::GetStringFUTF16(IDS_TRANSLATE_BUBBLE_ALWAYS,
                                  source_language_name,
                                  target_language_name);
   // "Always translate" checkbox doesn't exist in an incognito window.
   if (always_translate_checkbox_) {
     always_translate_checkbox_->SetText(message);
     always_translate_checkbox_->SetChecked(
         model_->ShouldAlwaysTranslate());
   }
 }