Refactoring: Remove an uneeded argment from TranslateBubbleView::TranslateBubbleView

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>
 
 #include "base/i18n/string_compare.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/translate/translate_ui_delegate.h"
 #include "chrome/browser/ui/browser.h"

[sky, 2013/12/19 16:45:21]

Is this include needed anymore?

[hajimehoshi, 2013/12/20 03:25:45]

Done.

 #include "chrome/browser/ui/translate/translate_bubble_model_impl.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox.h"
@@ skipping 100 matching lines @@
   // the child view is destructed. For example, |source_language_combobx_model_|
   // is referred by Combobox's destructor. Before destroying the models,
   // removing the child views is needed.
   RemoveAllChildViews(true);
 }
 
 // static
 void TranslateBubbleView::ShowBubble(views::View* anchor_view,
                                      content::WebContents* web_contents,
                                      TranslateBubbleModel::ViewState type,
-                                     TranslateErrors::Type error_type,
-                                     Browser* browser) {
+                                     TranslateErrors::Type error_type) {
   // During auto-translating, the bubble should not be shown.
   if (type == TranslateBubbleModel::VIEW_STATE_TRANSLATING ||
       type == TranslateBubbleModel::VIEW_STATE_AFTER_TRANSLATE) {
     TranslateTabHelper* translate_tab_helper =
         TranslateTabHelper::FromWebContents(web_contents);
     if (!translate_tab_helper ||
         translate_tab_helper->language_state().InTranslateNavigation()) {
       return;
     }
   }
@@ skipping 17 matching lines @@
   std::string target_language;
   GetTranslateLanguages(web_contents, &source_language, &target_language);
 
   scoped_ptr<TranslateUIDelegate> ui_delegate(
       new TranslateUIDelegate(web_contents, source_language, target_language));
   scoped_ptr<TranslateBubbleModel> model(
       new TranslateBubbleModelImpl(type, ui_delegate.Pass()));
   TranslateBubbleView* view = new TranslateBubbleView(anchor_view,
                                                       model.Pass(),
                                                       error_type,
-                                                      browser,
                                                       web_contents);
   views::BubbleDelegateView::CreateBubble(view)->Show();
 }
 
 // static
 bool TranslateBubbleView::IsShowing() {
   return translate_bubble_view_ != NULL;
 }
 
 // static
@@ skipping 126 matching lines @@
 }
 
 TranslateBubbleModel::ViewState TranslateBubbleView::GetViewState() const {
   return model_->GetViewState();
 }
 
 TranslateBubbleView::TranslateBubbleView(
     views::View* anchor_view,
     scoped_ptr<TranslateBubbleModel> model,
     TranslateErrors::Type error_type,
-    Browser* browser,
     content::WebContents* web_contents)
     : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       WebContentsObserver(web_contents),
       before_translate_view_(NULL),
       translating_view_(NULL),
       after_translate_view_(NULL),
       error_view_(NULL),
       advanced_view_(NULL),
       denial_combobox_(NULL),
       source_language_combobox_(NULL),
       target_language_combobox_(NULL),
       always_translate_checkbox_(NULL),
       advanced_cancel_button_(NULL),
       advanced_done_button_(NULL),
       model_(model.Pass()),
       error_type_(error_type),
       is_in_incognito_window_(
           web_contents ?
           web_contents->GetBrowserContext()->IsOffTheRecord() : false),
-      browser_(browser),
       translate_executed_(false),
       denial_button_clicked_(false) {
   if (model_->GetViewState() !=
       TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE) {
     translate_executed_ = true;
   }
 
   set_margins(gfx::Insets(views::kPanelVertMargin, views::kPanelHorizMargin,
                           views::kPanelVertMargin, views::kPanelHorizMargin));
 
@@ skipping 66 matching lines @@
 void TranslateBubbleView::HandleLinkClicked(
     TranslateBubbleView::LinkID sender_id) {
   switch (sender_id) {
     case LINK_ID_ADVANCED: {
       SwitchView(TranslateBubbleModel::VIEW_STATE_ADVANCED);
       break;
     }
     case LINK_ID_LANGUAGE_SETTINGS: {
       std::string url = std::string(chrome::kChromeUISettingsURL) +
           chrome::kLanguageOptionsSubPage;
-      browser_->OpenURL(content::OpenURLParams(
+      web_contents()->OpenURL(content::OpenURLParams(
           GURL(url),
           content::Referrer(),
           NEW_FOREGROUND_TAB,
           content::PAGE_TRANSITION_LINK,
           false));
       break;
     }
   }
 }
 
@@ skipping 359 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);
 }