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

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: 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"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 void AfterTranslateInfoBar::TargetLanguageChanged() { 159 void AfterTranslateInfoBar::TargetLanguageChanged() {
160 // Tests can call this function when the infobar has never been added to a 160 // Tests can call this function when the infobar has never been added to a
161 // view hierarchy and thus there is no button. 161 // view hierarchy and thus there is no button.
162 if (target_language_menu_button_) { 162 if (target_language_menu_button_) {
163 UpdateLanguageButtonText(target_language_menu_button_, 163 UpdateLanguageButtonText(target_language_menu_button_,
164 LanguagesMenuModel::TARGET); 164 LanguagesMenuModel::TARGET);
165 } 165 }
166 } 166 }
167 167
168 void AfterTranslateInfoBar::CancelMenu() {
169 menu_runner_.reset();
170 }
171
168 void AfterTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) { 172 void AfterTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) {
169 ui::MenuModel* menu_model = NULL; 173 ui::MenuModel* menu_model = NULL;
170 if (source == original_language_menu_button_) { 174 if (source == original_language_menu_button_) {
171 menu_model = &original_language_menu_model_; 175 menu_model = &original_language_menu_model_;
172 } else if (source == target_language_menu_button_) { 176 } else if (source == target_language_menu_button_) {
173 menu_model = &target_language_menu_model_; 177 menu_model = &target_language_menu_model_;
174 } else { 178 } else {
175 DCHECK_EQ(options_menu_button_, source); 179 DCHECK_EQ(options_menu_button_, source);
176 menu_model = &options_menu_model_; 180 menu_model = &options_menu_model_;
177 } 181 }
178 182
179 views::MenuModelAdapter menu_model_adapter(menu_model); 183 views::MenuModelAdapter menu_model_adapter(menu_model);
180 menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu())); 184 menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
181 if (menu_runner_->RunMenuAt( 185 if (menu_runner_->RunMenuAt(
182 source->GetWidget(), NULL, gfx::Rect(pt, gfx::Size()), 186 source->GetWidget(), NULL, gfx::Rect(pt, gfx::Size()),
183 views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) == 187 views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
184 views::MenuRunner::MENU_DELETED) 188 views::MenuRunner::MENU_DELETED)
185 return; 189 return;
186 } 190 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698