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

Side by Side Diff: chrome/browser/ui/views/infobars/before_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/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"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 181
182 void BeforeTranslateInfoBar::OriginalLanguageChanged() { 182 void BeforeTranslateInfoBar::OriginalLanguageChanged() {
183 // Tests can call this function when the infobar has never been added to a 183 // Tests can call this function when the infobar has never been added to a
184 // view hierarchy and thus there is no button. 184 // view hierarchy and thus there is no button.
185 if (language_menu_button_) { 185 if (language_menu_button_) {
186 UpdateLanguageButtonText(language_menu_button_, 186 UpdateLanguageButtonText(language_menu_button_,
187 LanguagesMenuModel::ORIGINAL); 187 LanguagesMenuModel::ORIGINAL);
188 } 188 }
189 } 189 }
190 190
191 void BeforeTranslateInfoBar::CancelMenu() {
192 menu_runner_.reset();
193 }
194
191 void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) { 195 void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) {
192 ui::MenuModel* menu_model = NULL; 196 ui::MenuModel* menu_model = NULL;
193 if (source == language_menu_button_) { 197 if (source == language_menu_button_) {
194 menu_model = &languages_menu_model_; 198 menu_model = &languages_menu_model_;
195 } else { 199 } else {
196 DCHECK_EQ(options_menu_button_, source); 200 DCHECK_EQ(options_menu_button_, source);
197 menu_model = &options_menu_model_; 201 menu_model = &options_menu_model_;
198 } 202 }
199 203
200 views::MenuModelAdapter menu_model_adapter(menu_model); 204 views::MenuModelAdapter menu_model_adapter(menu_model);
201 menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu())); 205 menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
202 if (menu_runner_->RunMenuAt(source->GetWidget(), NULL, 206 if (menu_runner_->RunMenuAt(source->GetWidget(), NULL,
203 gfx::Rect(pt, gfx::Size()), views::MenuItemView::TOPRIGHT, 207 gfx::Rect(pt, gfx::Size()), views::MenuItemView::TOPRIGHT,
204 views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED) 208 views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED)
205 return; 209 return;
206 } 210 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698