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

Side by Side Diff: trunk/src/chrome/browser/ui/gtk/infobars/translate_message_infobar_gtk.cc

Issue 102163002: Revert 238283 "Infobar system refactor." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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/translate_message_infobar_gtk.h" 5 #include "chrome/browser/ui/gtk/infobars/translate_message_infobar_gtk.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/translate/translate_infobar_delegate.h" 8 #include "chrome/browser/translate/translate_infobar_delegate.h"
9 #include "chrome/browser/ui/gtk/gtk_util.h" 9 #include "chrome/browser/ui/gtk/gtk_util.h"
10 #include "ui/base/gtk/gtk_hig_constants.h" 10 #include "ui/base/gtk/gtk_hig_constants.h"
11 #include "ui/base/gtk/gtk_signal_registrar.h" 11 #include "ui/base/gtk/gtk_signal_registrar.h"
12 12
13 TranslateMessageInfoBar::TranslateMessageInfoBar( 13 TranslateMessageInfoBar::TranslateMessageInfoBar(
14 scoped_ptr<TranslateInfoBarDelegate> delegate) 14 InfoBarService* owner,
15 : TranslateInfoBarBase(delegate.Pass()) { 15 TranslateInfoBarDelegate* delegate)
16 : TranslateInfoBarBase(owner, delegate) {
16 } 17 }
17 18
18 TranslateMessageInfoBar::~TranslateMessageInfoBar() { 19 TranslateMessageInfoBar::~TranslateMessageInfoBar() {
19 } 20 }
20 21
21 void TranslateMessageInfoBar::PlatformSpecificSetOwner() { 22 void TranslateMessageInfoBar::InitWidgets() {
22 TranslateInfoBarBase::PlatformSpecificSetOwner(); 23 TranslateInfoBarBase::InitWidgets();
23 24
24 GtkWidget* new_hbox = gtk_hbox_new(FALSE, ui::kControlSpacing); 25 GtkWidget* new_hbox = gtk_hbox_new(FALSE, ui::kControlSpacing);
25 gtk_util::CenterWidgetInHBox(hbox(), new_hbox, false, 0); 26 gtk_util::CenterWidgetInHBox(hbox(), new_hbox, false, 0);
26 27
27 std::string text = UTF16ToUTF8(GetDelegate()->GetMessageInfoBarText()); 28 std::string text = UTF16ToUTF8(GetDelegate()->GetMessageInfoBarText());
28 gtk_box_pack_start(GTK_BOX(new_hbox), CreateLabel(text.c_str()), FALSE, FALSE, 29 gtk_box_pack_start(GTK_BOX(new_hbox), CreateLabel(text.c_str()), FALSE, FALSE,
29 0); 30 0);
30 string16 button_text = GetDelegate()->GetMessageInfoBarButtonText(); 31 string16 button_text = GetDelegate()->GetMessageInfoBarButtonText();
31 if (!button_text.empty()) { 32 if (!button_text.empty()) {
32 GtkWidget* button = 33 GtkWidget* button =
33 gtk_button_new_with_label(UTF16ToUTF8(button_text).c_str()); 34 gtk_button_new_with_label(UTF16ToUTF8(button_text).c_str());
34 signals()->Connect(button, "clicked", G_CALLBACK(&OnButtonPressedThunk), 35 signals()->Connect(button, "clicked", G_CALLBACK(&OnButtonPressedThunk),
35 this); 36 this);
36 gtk_box_pack_start(GTK_BOX(new_hbox), button, FALSE, FALSE, 0); 37 gtk_box_pack_start(GTK_BOX(new_hbox), button, FALSE, FALSE, 0);
37 } 38 }
38 } 39 }
39 40
40 void TranslateMessageInfoBar::OnButtonPressed(GtkWidget* sender) { 41 void TranslateMessageInfoBar::OnButtonPressed(GtkWidget* sender) {
41 GetDelegate()->MessageInfoBarButtonPressed(); 42 GetDelegate()->MessageInfoBarButtonPressed();
42 } 43 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698