Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(544)

Unified Diff: chrome/browser/ui/views/infobars/before_translate_infobar.cc

Issue 325483003: Remove unused Views Translate InfoBar code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update comments, add early return for PolicyTest.DISABLED_TranslateEnabled. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/infobars/before_translate_infobar.cc
diff --git a/chrome/browser/ui/views/infobars/before_translate_infobar.cc b/chrome/browser/ui/views/infobars/before_translate_infobar.cc
deleted file mode 100644
index 085bb9bfee67ae86c4cd4b8cfbd807954f5c075e..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/infobars/before_translate_infobar.cc
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) 2012 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/infobars/before_translate_infobar.h"
-
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/views/infobars/translate_language_menu_model.h"
-#include "components/translate/core/browser/options_menu_model.h"
-#include "components/translate/core/browser/translate_infobar_delegate.h"
-#include "grit/components_strings.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/views/controls/button/label_button.h"
-#include "ui/views/controls/button/menu_button.h"
-#include "ui/views/controls/label.h"
-
-BeforeTranslateInfoBar::BeforeTranslateInfoBar(
- scoped_ptr<TranslateInfoBarDelegate> delegate)
- : TranslateInfoBarBase(delegate.Pass()),
- label_1_(NULL),
- label_2_(NULL),
- language_menu_button_(NULL),
- accept_button_(NULL),
- deny_button_(NULL),
- never_translate_button_(NULL),
- always_translate_button_(NULL),
- options_menu_button_(NULL) {
-}
-
-BeforeTranslateInfoBar::~BeforeTranslateInfoBar() {
-}
-
-void BeforeTranslateInfoBar::Layout() {
- TranslateInfoBarBase::Layout();
-
- int x = StartX();
- Labels labels;
- labels.push_back(label_1_);
- labels.push_back(label_2_);
- AssignWidths(&labels, std::max(0, EndX() - x - NonLabelWidth()));
-
- label_1_->SetPosition(gfx::Point(x, OffsetY(label_1_)));
- if (!label_1_->text().empty())
- x = label_1_->bounds().right() + kButtonInLabelSpacing;
-
- language_menu_button_->SetPosition(
- gfx::Point(x, OffsetY(language_menu_button_)));
- x = language_menu_button_->bounds().right();
-
- label_2_->SetPosition(
- gfx::Point(x + kButtonInLabelSpacing, OffsetY(label_2_)));
- x = (label_2_->text().empty() ? x : label_2_->bounds().right()) +
- kEndOfLabelSpacing;
-
- accept_button_->SetPosition(gfx::Point(x, OffsetY(accept_button_)));
- x = accept_button_->bounds().right() + kButtonButtonSpacing;
-
- deny_button_->SetPosition(gfx::Point(x, OffsetY(deny_button_)));
- x = deny_button_->bounds().right() + kButtonButtonSpacing;
-
- if (never_translate_button_) {
- never_translate_button_->SetPosition(
- gfx::Point(x, OffsetY(never_translate_button_)));
- x = never_translate_button_->bounds().right() + kButtonButtonSpacing;
- }
-
- if (always_translate_button_) {
- always_translate_button_->SetPosition(
- gfx::Point(x, OffsetY(always_translate_button_)));
- }
-
- options_menu_button_->SetPosition(gfx::Point(
- EndX() - options_menu_button_->width(), OffsetY(options_menu_button_)));
-}
-
-void BeforeTranslateInfoBar::ViewHierarchyChanged(
- const ViewHierarchyChangedDetails& details) {
- if (!details.is_add || (details.child != this) || (label_1_ != NULL)) {
- TranslateInfoBarBase::ViewHierarchyChanged(details);
- return;
- }
-
- size_t offset = 0;
- base::string16 text(
- l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_BEFORE_MESSAGE,
- base::string16(), &offset));
-
- label_1_ = CreateLabel(text.substr(0, offset));
- AddChildView(label_1_);
-
- language_menu_button_ = CreateMenuButton(base::string16(), this);
- TranslateInfoBarDelegate* delegate = GetDelegate();
- language_menu_model_.reset(new TranslateLanguageMenuModel(
- TranslateLanguageMenuModel::ORIGINAL, delegate, this,
- language_menu_button_, false));
- AddChildView(language_menu_button_);
-
- label_2_ = CreateLabel(text.substr(offset));
- AddChildView(label_2_);
-
- accept_button_ = CreateLabelButton(
- this, l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_ACCEPT));
- AddChildView(accept_button_);
-
- deny_button_ = CreateLabelButton(
- this, l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_DENY));
- AddChildView(deny_button_);
-
- const base::string16& language(
- delegate->language_name_at(delegate->original_language_index()));
- if (delegate->ShouldShowNeverTranslateShortcut()) {
- DCHECK(!delegate->ShouldShowAlwaysTranslateShortcut());
- never_translate_button_ = CreateLabelButton(
- this,
- l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_NEVER_TRANSLATE,
- language));
- AddChildView(never_translate_button_);
- } else if (delegate->ShouldShowAlwaysTranslateShortcut()) {
- always_translate_button_ = CreateLabelButton(
- this,
- l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_ALWAYS_TRANSLATE,
- language));
- AddChildView(always_translate_button_);
- }
-
- options_menu_button_ = CreateMenuButton(
- l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_OPTIONS), this);
- options_menu_model_.reset(new OptionsMenuModel(delegate));
- AddChildView(options_menu_button_);
-
- // This must happen after adding all other children so InfoBarView can ensure
- // the close button is the last child.
- TranslateInfoBarBase::ViewHierarchyChanged(details);
-
- // This must happen after adding all children because it triggers layout,
- // which assumes that particular children (e.g. the close button) have already
- // been added.
- UpdateLanguageButtonText(language_menu_button_,
- delegate->language_name_at(delegate->original_language_index()));
-}
-
-int BeforeTranslateInfoBar::ContentMinimumWidth() const {
- return label_1_->GetMinimumSize().width() +
- label_2_->GetMinimumSize().width() + NonLabelWidth();
-}
-
-void BeforeTranslateInfoBar::ButtonPressed(views::Button* sender,
- const ui::Event& event) {
- if (!owner())
- return; // We're closing; don't call anything, it might access the owner.
- TranslateInfoBarDelegate* delegate = GetDelegate();
- if (sender == accept_button_) {
- delegate->Translate();
- } else if (sender == deny_button_) {
- delegate->TranslationDeclined();
- RemoveSelf();
- } else if (sender == never_translate_button_) {
- delegate->NeverTranslatePageLanguage();
- } else if (sender == always_translate_button_) {
- delegate->AlwaysTranslatePageLanguage();
- } else {
- TranslateInfoBarBase::ButtonPressed(sender, event);
- }
-}
-
-void BeforeTranslateInfoBar::OnMenuButtonClicked(views::View* source,
- const gfx::Point& point) {
- if (!owner())
- return; // We're closing; don't call anything, it might access the owner.
- if (source == language_menu_button_) {
- RunMenuAt(language_menu_model_.get(),
- language_menu_button_,
- views::MENU_ANCHOR_TOPLEFT);
- } else {
- DCHECK_EQ(options_menu_button_, source);
- RunMenuAt(options_menu_model_.get(),
- options_menu_button_,
- views::MENU_ANCHOR_TOPRIGHT);
- }
-}
-
-int BeforeTranslateInfoBar::NonLabelWidth() const {
- return (label_1_->text().empty() ? 0 : kButtonInLabelSpacing) +
- language_menu_button_->width() +
- (label_2_->text().empty() ? 0 : kButtonInLabelSpacing) +
- kEndOfLabelSpacing + accept_button_->width() + kButtonButtonSpacing +
- deny_button_->width() +
- (never_translate_button_ ?
- (kButtonButtonSpacing + never_translate_button_->width()) : 0) +
- (always_translate_button_ ?
- (kButtonButtonSpacing + always_translate_button_->width()) : 0) +
- kEndOfLabelSpacing + options_menu_button_->width();
-}

Powered by Google App Engine
This is Rietveld 408576698