OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/translate/translate_infobar_delegate.h" | 8 #include "chrome/browser/translate/translate_infobar_delegate.h" |
9 #include "grit/generated_resources.h" | 9 #include "grit/generated_resources.h" |
10 #include "ui/base/l10n/l10n_util.h" | 10 #include "ui/base/l10n/l10n_util.h" |
11 #include "views/controls/button/menu_button.h" | 11 #include "views/controls/button/menu_button.h" |
12 #include "views/controls/label.h" | 12 #include "views/controls/label.h" |
13 #include "views/controls/menu/menu_item_view.h" | 13 #include "views/controls/menu/menu_item_view.h" |
14 #include "views/controls/menu/menu_model_adapter.h" | |
15 #include "views/controls/menu/menu_runner.h" | |
16 #include "views/widget/widget.h" | |
17 | 14 |
18 BeforeTranslateInfoBar::BeforeTranslateInfoBar( | 15 BeforeTranslateInfoBar::BeforeTranslateInfoBar( |
19 TabContentsWrapper* owner, | 16 TabContentsWrapper* owner, |
20 TranslateInfoBarDelegate* delegate) | 17 TranslateInfoBarDelegate* delegate) |
21 : TranslateInfoBarBase(owner, delegate), | 18 : TranslateInfoBarBase(owner, delegate), |
22 label_1_(NULL), | 19 label_1_(NULL), |
23 label_2_(NULL), | 20 label_2_(NULL), |
24 language_menu_button_(NULL), | 21 language_menu_button_(NULL), |
25 accept_button_(NULL), | 22 accept_button_(NULL), |
26 deny_button_(NULL), | 23 deny_button_(NULL), |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
183 // Tests can call this function when the infobar has never been added to a | 180 // Tests can call this function when the infobar has never been added to a |
184 // view hierarchy and thus there is no button. | 181 // view hierarchy and thus there is no button. |
185 if (language_menu_button_) { | 182 if (language_menu_button_) { |
186 UpdateLanguageButtonText(language_menu_button_, | 183 UpdateLanguageButtonText(language_menu_button_, |
187 LanguagesMenuModel::ORIGINAL); | 184 LanguagesMenuModel::ORIGINAL); |
188 } | 185 } |
189 } | 186 } |
190 | 187 |
191 void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) { | 188 void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) { |
192 ui::MenuModel* menu_model = NULL; | 189 ui::MenuModel* menu_model = NULL; |
190 views::MenuButton* button = NULL; | |
191 views::MenuItemView::AnchorPosition anchor = views::MenuItemView::TOPLEFT; | |
193 if (source == language_menu_button_) { | 192 if (source == language_menu_button_) { |
194 menu_model = &languages_menu_model_; | 193 menu_model = &languages_menu_model_; |
194 button = language_menu_button_; | |
195 } else { | 195 } else { |
196 DCHECK_EQ(options_menu_button_, source); | 196 DCHECK_EQ(options_menu_button_, source); |
197 menu_model = &options_menu_model_; | 197 menu_model = &options_menu_model_; |
198 button = options_menu_button_; | |
199 anchor = views::MenuItemView::TOPRIGHT; | |
198 } | 200 } |
199 | 201 |
200 views::MenuModelAdapter menu_model_adapter(menu_model); | 202 if (RunMenuAt(menu_model, button, anchor) == views::MenuRunner::MENU_DELETED) |
Peter Kasting
2011/09/15 21:43:12
Nit: Same nit.
| |
201 menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu())); | |
202 if (menu_runner_->RunMenuAt(source->GetWidget(), NULL, | |
203 gfx::Rect(pt, gfx::Size()), views::MenuItemView::TOPRIGHT, | |
204 views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED) | |
205 return; | 203 return; |
206 } | 204 } |
OLD | NEW |