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

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

Issue 7745057: Speculative fix for 93314. I suspect 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
« no previous file with comments | « chrome/browser/ui/views/infobars/before_translate_infobar.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) { 191 void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) {
192 ui::MenuModel* menu_model = NULL; 192 ui::MenuModel* menu_model = NULL;
193 if (source == language_menu_button_) { 193 if (source == language_menu_button_) {
194 menu_model = &languages_menu_model_; 194 menu_model = &languages_menu_model_;
195 } else { 195 } else {
196 DCHECK_EQ(options_menu_button_, source); 196 DCHECK_EQ(options_menu_button_, source);
197 menu_model = &options_menu_model_; 197 menu_model = &options_menu_model_;
198 } 198 }
199 199
200 views::MenuModelAdapter menu_model_adapter(menu_model); 200 views::MenuModelAdapter menu_model_adapter(menu_model);
201 views::MenuRunner menu_runner(menu_model_adapter.CreateMenu()); 201 menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
202 if (menu_runner.RunMenuAt(source->GetWidget(), NULL, 202 if (menu_runner_->RunMenuAt(source->GetWidget(), NULL,
203 gfx::Rect(pt, gfx::Size()), views::MenuItemView::TOPRIGHT, 203 gfx::Rect(pt, gfx::Size()), views::MenuItemView::TOPRIGHT,
204 views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED) 204 views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED)
205 return; 205 return;
206 } 206 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/infobars/before_translate_infobar.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698