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

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

Issue 10956056: Fix typo that resulted in us screwing up the after-translate infobar menu models on views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « no previous file | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 DCHECK_EQ(3U, strings.size()); 88 DCHECK_EQ(3U, strings.size());
89 89
90 label_1_ = CreateLabel(strings[0]); 90 label_1_ = CreateLabel(strings[0]);
91 AddChildView(label_1_); 91 AddChildView(label_1_);
92 92
93 original_language_menu_button_ = CreateMenuButton(string16(), this); 93 original_language_menu_button_ = CreateMenuButton(string16(), this);
94 original_language_menu_model_.reset(new TranslateLanguageMenuModel( 94 original_language_menu_model_.reset(new TranslateLanguageMenuModel(
95 TranslateLanguageMenuModel::ORIGINAL, delegate, this, 95 TranslateLanguageMenuModel::ORIGINAL, delegate, this,
96 original_language_menu_button_, true)); 96 original_language_menu_button_, true));
97 target_language_menu_button_ = CreateMenuButton(string16(), this); 97 target_language_menu_button_ = CreateMenuButton(string16(), this);
98 original_language_menu_model_.reset(new TranslateLanguageMenuModel( 98 target_language_menu_model_.reset(new TranslateLanguageMenuModel(
99 TranslateLanguageMenuModel::TARGET, delegate, this, 99 TranslateLanguageMenuModel::TARGET, delegate, this,
100 target_language_menu_button_, true)); 100 target_language_menu_button_, true));
101 AddChildView(swapped_language_buttons_ ? 101 AddChildView(swapped_language_buttons_ ?
102 target_language_menu_button_ : original_language_menu_button_); 102 target_language_menu_button_ : original_language_menu_button_);
103 103
104 label_2_ = CreateLabel(strings[1]); 104 label_2_ = CreateLabel(strings[1]);
105 AddChildView(label_2_); 105 AddChildView(label_2_);
106 106
107 AddChildView(swapped_language_buttons_ ? 107 AddChildView(swapped_language_buttons_ ?
108 original_language_menu_button_ : target_language_menu_button_); 108 original_language_menu_button_ : target_language_menu_button_);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 original_language_menu_button_, views::MenuItemView::TOPLEFT); 162 original_language_menu_button_, views::MenuItemView::TOPLEFT);
163 } else if (source == target_language_menu_button_) { 163 } else if (source == target_language_menu_button_) {
164 RunMenuAt(target_language_menu_model_.get(), target_language_menu_button_, 164 RunMenuAt(target_language_menu_model_.get(), target_language_menu_button_,
165 views::MenuItemView::TOPLEFT); 165 views::MenuItemView::TOPLEFT);
166 } else { 166 } else {
167 DCHECK_EQ(options_menu_button_, source); 167 DCHECK_EQ(options_menu_button_, source);
168 RunMenuAt(&options_menu_model_, options_menu_button_, 168 RunMenuAt(&options_menu_model_, options_menu_button_,
169 views::MenuItemView::TOPRIGHT); 169 views::MenuItemView::TOPRIGHT);
170 } 170 }
171 } 171 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698