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

Side by Side Diff: chrome/browser/ui/views/infobars/after_translate_infobar.cc

Issue 7796010: Attempt at fixing crash in menus shown from infobars. Here's what the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ignore return value Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
15 #include "views/controls/menu/menu_runner.h"
16 #include "views/widget/widget.h"
17 14
18 AfterTranslateInfoBar::AfterTranslateInfoBar( 15 AfterTranslateInfoBar::AfterTranslateInfoBar(
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 label_3_(NULL), 21 label_3_(NULL),
25 original_language_menu_button_(NULL), 22 original_language_menu_button_(NULL),
26 target_language_menu_button_(NULL), 23 target_language_menu_button_(NULL),
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 // Tests can call this function when the infobar has never been added to a 157 // Tests can call this function when the infobar has never been added to a
161 // view hierarchy and thus there is no button. 158 // view hierarchy and thus there is no button.
162 if (target_language_menu_button_) { 159 if (target_language_menu_button_) {
163 UpdateLanguageButtonText(target_language_menu_button_, 160 UpdateLanguageButtonText(target_language_menu_button_,
164 LanguagesMenuModel::TARGET); 161 LanguagesMenuModel::TARGET);
165 } 162 }
166 } 163 }
167 164
168 void AfterTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) { 165 void AfterTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) {
169 ui::MenuModel* menu_model = NULL; 166 ui::MenuModel* menu_model = NULL;
167 views::MenuButton* button = NULL;
168 views::MenuItemView::AnchorPosition anchor = views::MenuItemView::TOPLEFT;
170 if (source == original_language_menu_button_) { 169 if (source == original_language_menu_button_) {
171 menu_model = &original_language_menu_model_; 170 menu_model = &original_language_menu_model_;
171 button = original_language_menu_button_;
172 } else if (source == target_language_menu_button_) { 172 } else if (source == target_language_menu_button_) {
173 menu_model = &target_language_menu_model_; 173 menu_model = &target_language_menu_model_;
174 button = target_language_menu_button_;
174 } else { 175 } else {
175 DCHECK_EQ(options_menu_button_, source); 176 DCHECK_EQ(options_menu_button_, source);
176 menu_model = &options_menu_model_; 177 menu_model = &options_menu_model_;
178 button = options_menu_button_;
179 anchor = views::MenuItemView::TOPRIGHT;
177 } 180 }
178 181 RunMenuAt(menu_model, button, anchor);
179 views::MenuModelAdapter menu_model_adapter(menu_model); 182 // TODO(pkasting): this may be deleted after rewrite.
180 menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
181 if (menu_runner_->RunMenuAt(
182 source->GetWidget(), NULL, gfx::Rect(pt, gfx::Size()),
183 views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
184 views::MenuRunner::MENU_DELETED)
185 return;
186 } 183 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698