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

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

Issue 6574011: Cleanup:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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/options_menu_model.h"
9 #include "chrome/browser/translate/translate_infobar_delegate.h" 8 #include "chrome/browser/translate/translate_infobar_delegate.h"
10 #include "chrome/browser/ui/views/infobars/infobar_button_border.h"
11 #include "chrome/browser/ui/views/infobars/infobar_text_button.h"
12 #include "grit/app_resources.h"
13 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
14 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
15 #include "views/controls/button/menu_button.h" 11 #include "views/controls/button/menu_button.h"
16 #include "views/controls/button/text_button.h"
17 #include "views/controls/image_view.h" 12 #include "views/controls/image_view.h"
18 #include "views/controls/label.h" 13 #include "views/controls/label.h"
19 #include "views/controls/menu/menu_2.h" 14 #include "views/controls/menu/menu_2.h"
20 15
21 AfterTranslateInfoBar::AfterTranslateInfoBar( 16 AfterTranslateInfoBar::AfterTranslateInfoBar(
22 TranslateInfoBarDelegate* delegate) 17 TranslateInfoBarDelegate* delegate)
23 : TranslateInfoBarBase(delegate), 18 : TranslateInfoBarBase(delegate),
24 original_language_menu_model_(delegate, LanguagesMenuModel::ORIGINAL), 19 original_language_menu_model_(delegate, LanguagesMenuModel::ORIGINAL),
25 target_language_menu_model_(delegate, LanguagesMenuModel::TARGET), 20 target_language_menu_model_(delegate, LanguagesMenuModel::TARGET),
26 options_menu_model_(delegate), 21 options_menu_model_(delegate),
(...skipping 12 matching lines...) Expand all
39 34
40 label_2_ = CreateLabel(strings[1]); 35 label_2_ = CreateLabel(strings[1]);
41 AddChildView(label_2_); 36 AddChildView(label_2_);
42 37
43 AddChildView(swapped_language_buttons_ ? 38 AddChildView(swapped_language_buttons_ ?
44 original_language_menu_button_ : target_language_menu_button_); 39 original_language_menu_button_ : target_language_menu_button_);
45 40
46 label_3_ = CreateLabel(strings[2]); 41 label_3_ = CreateLabel(strings[2]);
47 AddChildView(label_3_); 42 AddChildView(label_3_);
48 43
49 revert_button_ = InfoBarTextButton::Create(this, 44 revert_button_ = CreateTextButton(this,
50 l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_REVERT)); 45 l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_REVERT), false);
51 AddChildView(revert_button_); 46 AddChildView(revert_button_);
52 47
53 options_menu_button_ = CreateMenuButton( 48 options_menu_button_ = CreateMenuButton(
54 l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_OPTIONS), false, this); 49 l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_OPTIONS), false, this);
55 AddChildView(options_menu_button_); 50 AddChildView(options_menu_button_);
56 51
57 OriginalLanguageChanged(); 52 OriginalLanguageChanged();
58 TargetLanguageChanged(); 53 TargetLanguageChanged();
59 } 54 }
60 55
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 new views::Menu2(&target_language_menu_model_)); 127 new views::Menu2(&target_language_menu_model_));
133 } 128 }
134 target_language_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); 129 target_language_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
135 } else { 130 } else {
136 DCHECK_EQ(options_menu_button_, source); 131 DCHECK_EQ(options_menu_button_, source);
137 if (!options_menu_.get()) 132 if (!options_menu_.get())
138 options_menu_.reset(new views::Menu2(&options_menu_model_)); 133 options_menu_.reset(new views::Menu2(&options_menu_model_));
139 options_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); 134 options_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
140 } 135 }
141 } 136 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698