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

Side by Side Diff: chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.cc

Issue 7749017: Revert "content: Start splitting up chrome/browser/ui/gtk/gtk_util.h" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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/gtk/infobars/after_translate_infobar_gtk.h" 5 #include "chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/translate/translate_infobar_delegate.h" 9 #include "chrome/browser/translate/translate_infobar_delegate.h"
10 #include "chrome/browser/ui/gtk/gtk_util.h" 10 #include "chrome/browser/ui/gtk/gtk_util.h"
11 #include "grit/generated_resources.h" 11 #include "grit/generated_resources.h"
12 #include "ui/base/gtk/gtk_hig_constants.h"
13 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
14 13
15 AfterTranslateInfoBar::AfterTranslateInfoBar( 14 AfterTranslateInfoBar::AfterTranslateInfoBar(
16 TabContentsWrapper* owner, 15 TabContentsWrapper* owner,
17 TranslateInfoBarDelegate* delegate) 16 TranslateInfoBarDelegate* delegate)
18 : TranslateInfoBarBase(owner, delegate), 17 : TranslateInfoBarBase(owner, delegate),
19 ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { 18 ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
20 } 19 }
21 20
22 AfterTranslateInfoBar::~AfterTranslateInfoBar() { 21 AfterTranslateInfoBar::~AfterTranslateInfoBar() {
23 } 22 }
24 23
25 void AfterTranslateInfoBar::Init() { 24 void AfterTranslateInfoBar::Init() {
26 TranslateInfoBarBase::Init(); 25 TranslateInfoBarBase::Init();
27 26
28 bool swapped_language_combos = false; 27 bool swapped_language_combos = false;
29 std::vector<string16> strings; 28 std::vector<string16> strings;
30 TranslateInfoBarDelegate::GetAfterTranslateStrings( 29 TranslateInfoBarDelegate::GetAfterTranslateStrings(
31 &strings, &swapped_language_combos); 30 &strings, &swapped_language_combos);
32 DCHECK(strings.size() == 3U); 31 DCHECK(strings.size() == 3U);
33 32
34 GtkWidget* hbox = gtk_hbox_new(FALSE, ui::kControlSpacing); 33 GtkWidget* hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
35 gtk_util::CenterWidgetInHBox(hbox_, hbox, false, 0); 34 gtk_util::CenterWidgetInHBox(hbox_, hbox, false, 0);
36 35
37 GtkWidget* original_lang_combo = 36 GtkWidget* original_lang_combo =
38 CreateLanguageCombobox(GetDelegate()->original_language_index(), 37 CreateLanguageCombobox(GetDelegate()->original_language_index(),
39 GetDelegate()->target_language_index()); 38 GetDelegate()->target_language_index());
40 g_signal_connect(original_lang_combo, "changed", 39 g_signal_connect(original_lang_combo, "changed",
41 G_CALLBACK(&OnOriginalLanguageModifiedThunk), this); 40 G_CALLBACK(&OnOriginalLanguageModifiedThunk), this);
42 GtkWidget* target_lang_combo = 41 GtkWidget* target_lang_combo =
43 CreateLanguageCombobox(GetDelegate()->target_language_index(), 42 CreateLanguageCombobox(GetDelegate()->target_language_index(),
44 GetDelegate()->original_language_index()); 43 GetDelegate()->original_language_index());
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 GetDelegate()->RevertTranslation(); 95 GetDelegate()->RevertTranslation();
97 } 96 }
98 97
99 void AfterTranslateInfoBar::SetOriginalLanguage(size_t language_index) { 98 void AfterTranslateInfoBar::SetOriginalLanguage(size_t language_index) {
100 GetDelegate()->SetOriginalLanguage(language_index); 99 GetDelegate()->SetOriginalLanguage(language_index);
101 } 100 }
102 101
103 void AfterTranslateInfoBar::SetTargetLanguage(size_t language_index) { 102 void AfterTranslateInfoBar::SetTargetLanguage(size_t language_index) {
104 GetDelegate()->SetTargetLanguage(language_index); 103 GetDelegate()->SetTargetLanguage(language_index);
105 } 104 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698