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/after_translate_infobar.h" | 5 #include "chrome/browser/ui/views/infobars/after_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 AfterTranslateInfoBar::AfterTranslateInfoBar( | 18 AfterTranslateInfoBar::AfterTranslateInfoBar( |
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 label_3_(NULL), | 24 label_3_(NULL), |
24 original_language_menu_button_(NULL), | 25 original_language_menu_button_(NULL), |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 if (source == original_language_menu_button_) { | 170 if (source == original_language_menu_button_) { |
170 menu_model = &original_language_menu_model_; | 171 menu_model = &original_language_menu_model_; |
171 } else if (source == target_language_menu_button_) { | 172 } else if (source == target_language_menu_button_) { |
172 menu_model = &target_language_menu_model_; | 173 menu_model = &target_language_menu_model_; |
173 } else { | 174 } else { |
174 DCHECK_EQ(options_menu_button_, source); | 175 DCHECK_EQ(options_menu_button_, source); |
175 menu_model = &options_menu_model_; | 176 menu_model = &options_menu_model_; |
176 } | 177 } |
177 | 178 |
178 views::MenuModelAdapter menu_model_adapter(menu_model); | 179 views::MenuModelAdapter menu_model_adapter(menu_model); |
179 views::MenuItemView menu(&menu_model_adapter); | 180 views::MenuRunner menu_runner(menu_model_adapter.CreateMenu()); |
180 menu_model_adapter.BuildMenu(&menu); | 181 if (menu_runner.RunMenuAt( |
181 menu.RunMenuAt(source->GetWidget(), NULL, gfx::Rect(pt, gfx::Size()), | 182 source->GetWidget(), NULL, gfx::Rect(pt, gfx::Size()), |
182 views::MenuItemView::TOPRIGHT, true); | 183 views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) == |
| 184 views::MenuRunner::MENU_DELETED) |
| 185 return; |
183 } | 186 } |
OLD | NEW |