Refactoring: Remove an uneeded argment from TranslateBubbleView::TranslateBubbleView

We can use a WebContent to open a new tab instead of a Browser.

TEST=unit_tests --gtest_filter=TranslateBubbleViewTest.*

Review URL: https://codereview.chromium.org/106793006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242077 0039d316-1c4b-4281-b951-d872f2087c98
parent 30bdaa9d
......@@ -1214,8 +1214,7 @@ void BrowserView::ShowTranslateBubble(
language_state.SetTranslateEnabled(true);
TranslateBubbleView::ShowBubble(GetToolbarView()->GetTranslateBubbleAnchor(),
web_contents, view_state, error_type,
browser_.get());
web_contents, view_state, error_type);
}
#if defined(ENABLE_ONE_CLICK_SIGNIN)
......
......@@ -18,7 +18,6 @@
#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"
#include "chrome/browser/ui/translate/translate_bubble_model_impl.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/web_contents.h"
......@@ -139,8 +138,7 @@ TranslateBubbleView::~TranslateBubbleView() {
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) {
......@@ -178,7 +176,6 @@ void TranslateBubbleView::ShowBubble(views::View* anchor_view,
TranslateBubbleView* view = new TranslateBubbleView(anchor_view,
model.Pass(),
error_type,
browser,
web_contents);
views::BubbleDelegateView::CreateBubble(view)->Show();
}
......@@ -325,7 +322,6 @@ 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),
......@@ -345,7 +341,6 @@ TranslateBubbleView::TranslateBubbleView(
is_in_incognito_window_(
web_contents ?
web_contents->GetBrowserContext()->IsOffTheRecord() : false),
browser_(browser),
translate_executed_(false),
denial_button_clicked_(false) {
if (model_->GetViewState() !=
......@@ -432,7 +427,7 @@ void TranslateBubbleView::HandleLinkClicked(
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,
......
......@@ -18,7 +18,6 @@
#include "ui/views/controls/combobox/combobox_listener.h"
#include "ui/views/controls/link_listener.h"
class Browser;
class PrefService;
class TranslateBubbleModel;
......@@ -42,8 +41,7 @@ class TranslateBubbleView : public views::BubbleDelegateView,
static void ShowBubble(views::View* anchor_view,
content::WebContents* web_contents,
TranslateBubbleModel::ViewState type,
TranslateErrors::Type error_type,
Browser* browser);
TranslateErrors::Type error_type);
// If true, the Translate bubble is being shown.
static bool IsShowing();
......@@ -121,7 +119,6 @@ class TranslateBubbleView : public views::BubbleDelegateView,
TranslateBubbleView(views::View* anchor_view,
scoped_ptr<TranslateBubbleModel> model,
TranslateErrors::Type error_type,
Browser* browser,
content::WebContents* web_contents);
// Returns the current child view.
......@@ -193,9 +190,6 @@ class TranslateBubbleView : public views::BubbleDelegateView,
// Whether the window is an incognito window.
const bool is_in_incognito_window_;
// The browser to open the help URL into a new tab.
Browser* browser_;
// Whether the translation is acutually executed.
bool translate_executed_;
......
......@@ -152,7 +152,6 @@ class TranslateBubbleViewTest : public views::ViewsTestBase {
bubble_ = new TranslateBubbleView(anchor_widget_->GetContentsView(),
model.Pass(),
TranslateErrors::NONE,
NULL,
NULL);
views::BubbleDelegateView::CreateBubble(bubble_)->Show();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment