OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/infobars/before_translate_infobar.h" | 5 #include "chrome/browser/ui/views/infobars/before_translate_infobar.h" |
6 | 6 |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "chrome/browser/translate/options_menu_model.h" | 8 #include "chrome/browser/translate/options_menu_model.h" |
9 #include "chrome/browser/translate/translate_infobar_delegate.h" | 9 #include "chrome/browser/translate/translate_infobar_delegate.h" |
10 #include "chrome/browser/ui/views/infobars/translate_language_menu_model.h" | 10 #include "chrome/browser/ui/views/infobars/translate_language_menu_model.h" |
11 #include "grit/generated_resources.h" | 11 #include "grit/generated_resources.h" |
12 #include "ui/base/l10n/l10n_util.h" | 12 #include "ui/base/l10n/l10n_util.h" |
13 #include "ui/views/controls/button/label_button.h" | 13 #include "ui/views/controls/button/label_button.h" |
14 #include "ui/views/controls/button/menu_button.h" | 14 #include "ui/views/controls/button/menu_button.h" |
15 #include "ui/views/controls/label.h" | 15 #include "ui/views/controls/label.h" |
16 #include "ui/views/controls/menu/menu_item_view.h" | |
17 | 16 |
18 BeforeTranslateInfoBar::BeforeTranslateInfoBar( | 17 BeforeTranslateInfoBar::BeforeTranslateInfoBar( |
19 scoped_ptr<TranslateInfoBarDelegate> delegate) | 18 scoped_ptr<TranslateInfoBarDelegate> delegate) |
20 : TranslateInfoBarBase(delegate.Pass()), | 19 : TranslateInfoBarBase(delegate.Pass()), |
21 label_1_(NULL), | 20 label_1_(NULL), |
22 label_2_(NULL), | 21 label_2_(NULL), |
23 language_menu_button_(NULL), | 22 language_menu_button_(NULL), |
24 accept_button_(NULL), | 23 accept_button_(NULL), |
25 deny_button_(NULL), | 24 deny_button_(NULL), |
26 never_translate_button_(NULL), | 25 never_translate_button_(NULL), |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 } else { | 161 } else { |
163 TranslateInfoBarBase::ButtonPressed(sender, event); | 162 TranslateInfoBarBase::ButtonPressed(sender, event); |
164 } | 163 } |
165 } | 164 } |
166 | 165 |
167 void BeforeTranslateInfoBar::OnMenuButtonClicked(views::View* source, | 166 void BeforeTranslateInfoBar::OnMenuButtonClicked(views::View* source, |
168 const gfx::Point& point) { | 167 const gfx::Point& point) { |
169 if (!owner()) | 168 if (!owner()) |
170 return; // We're closing; don't call anything, it might access the owner. | 169 return; // We're closing; don't call anything, it might access the owner. |
171 if (source == language_menu_button_) { | 170 if (source == language_menu_button_) { |
172 RunMenuAt(language_menu_model_.get(), language_menu_button_, | 171 RunMenuAt(language_menu_model_.get(), |
173 views::MenuItemView::TOPLEFT); | 172 language_menu_button_, |
| 173 views::MENU_ANCHOR_TOPLEFT); |
174 } else { | 174 } else { |
175 DCHECK_EQ(options_menu_button_, source); | 175 DCHECK_EQ(options_menu_button_, source); |
176 RunMenuAt(options_menu_model_.get(), options_menu_button_, | 176 RunMenuAt(options_menu_model_.get(), |
177 views::MenuItemView::TOPRIGHT); | 177 options_menu_button_, |
| 178 views::MENU_ANCHOR_TOPRIGHT); |
178 } | 179 } |
179 } | 180 } |
180 | 181 |
181 int BeforeTranslateInfoBar::NonLabelWidth() const { | 182 int BeforeTranslateInfoBar::NonLabelWidth() const { |
182 return (label_1_->text().empty() ? 0 : kButtonInLabelSpacing) + | 183 return (label_1_->text().empty() ? 0 : kButtonInLabelSpacing) + |
183 language_menu_button_->width() + | 184 language_menu_button_->width() + |
184 (label_2_->text().empty() ? 0 : kButtonInLabelSpacing) + | 185 (label_2_->text().empty() ? 0 : kButtonInLabelSpacing) + |
185 kEndOfLabelSpacing + accept_button_->width() + kButtonButtonSpacing + | 186 kEndOfLabelSpacing + accept_button_->width() + kButtonButtonSpacing + |
186 deny_button_->width() + | 187 deny_button_->width() + |
187 (never_translate_button_ ? | 188 (never_translate_button_ ? |
188 (kButtonButtonSpacing + never_translate_button_->width()) : 0) + | 189 (kButtonButtonSpacing + never_translate_button_->width()) : 0) + |
189 (always_translate_button_ ? | 190 (always_translate_button_ ? |
190 (kButtonButtonSpacing + always_translate_button_->width()) : 0) + | 191 (kButtonButtonSpacing + always_translate_button_->width()) : 0) + |
191 kEndOfLabelSpacing + options_menu_button_->width(); | 192 kEndOfLabelSpacing + options_menu_button_->width(); |
192 } | 193 } |
OLD | NEW |