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" | 14 #include "views/controls/menu/menu_model_adapter.h" |
| 15 #include "views/controls/menu/menu_runner.h" |
15 #include "views/widget/widget.h" | 16 #include "views/widget/widget.h" |
16 | 17 |
17 BeforeTranslateInfoBar::BeforeTranslateInfoBar( | 18 BeforeTranslateInfoBar::BeforeTranslateInfoBar( |
18 TabContentsWrapper* owner, | 19 TabContentsWrapper* owner, |
19 TranslateInfoBarDelegate* delegate) | 20 TranslateInfoBarDelegate* delegate) |
20 : TranslateInfoBarBase(owner, delegate), | 21 : TranslateInfoBarBase(owner, delegate), |
21 label_1_(NULL), | 22 label_1_(NULL), |
22 label_2_(NULL), | 23 label_2_(NULL), |
23 language_menu_button_(NULL), | 24 language_menu_button_(NULL), |
24 accept_button_(NULL), | 25 accept_button_(NULL), |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) { | 191 void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) { |
191 ui::MenuModel* menu_model = NULL; | 192 ui::MenuModel* menu_model = NULL; |
192 if (source == language_menu_button_) { | 193 if (source == language_menu_button_) { |
193 menu_model = &languages_menu_model_; | 194 menu_model = &languages_menu_model_; |
194 } else { | 195 } else { |
195 DCHECK_EQ(options_menu_button_, source); | 196 DCHECK_EQ(options_menu_button_, source); |
196 menu_model = &options_menu_model_; | 197 menu_model = &options_menu_model_; |
197 } | 198 } |
198 | 199 |
199 views::MenuModelAdapter menu_model_adapter(menu_model); | 200 views::MenuModelAdapter menu_model_adapter(menu_model); |
200 views::MenuItemView menu(&menu_model_adapter); | 201 views::MenuRunner menu_runner(menu_model_adapter.CreateMenu()); |
201 menu_model_adapter.BuildMenu(&menu); | 202 if (menu_runner.RunMenuAt(source->GetWidget(), NULL, |
202 menu.RunMenuAt(source->GetWidget(), NULL, gfx::Rect(pt, gfx::Size()), | 203 gfx::Rect(pt, gfx::Size()), views::MenuItemView::TOPRIGHT, |
203 views::MenuItemView::TOPRIGHT, true); | 204 views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED) |
| 205 return; |
204 } | 206 } |
OLD | NEW |