| OLD | NEW |
| 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/gtk/one_click_signin_bubble_gtk.h" | 5 #include "chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 | 146 |
| 147 header_label_ = theme_provider->BuildLabel( | 147 header_label_ = theme_provider->BuildLabel( |
| 148 l10n_util::GetStringUTF8(IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE), | 148 l10n_util::GetStringUTF8(IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE), |
| 149 ui::kGdkBlack); | 149 ui::kGdkBlack); |
| 150 | 150 |
| 151 PangoAttrList* attributes = pango_attr_list_new(); | 151 PangoAttrList* attributes = pango_attr_list_new(); |
| 152 pango_attr_list_insert(attributes, | 152 pango_attr_list_insert(attributes, |
| 153 pango_attr_weight_new(PANGO_WEIGHT_BOLD)); | 153 pango_attr_weight_new(PANGO_WEIGHT_BOLD)); |
| 154 gtk_label_set_attributes(GTK_LABEL(header_label_), attributes); | 154 gtk_label_set_attributes(GTK_LABEL(header_label_), attributes); |
| 155 pango_attr_list_unref(attributes); | 155 pango_attr_list_unref(attributes); |
| 156 close_button_.reset(CustomDrawButton::CloseButton(theme_provider)); | 156 close_button_.reset(CustomDrawButton::CloseButtonBubble(theme_provider)); |
| 157 g_signal_connect(close_button_->widget(), "clicked", | 157 g_signal_connect(close_button_->widget(), "clicked", |
| 158 G_CALLBACK(OnClickCloseButtonThunk), this); | 158 G_CALLBACK(OnClickCloseButtonThunk), this); |
| 159 } | 159 } |
| 160 | 160 |
| 161 GtkWidget* OneClickSigninBubbleGtk::LayoutWidgets() { | 161 GtkWidget* OneClickSigninBubbleGtk::LayoutWidgets() { |
| 162 // Setup the BubbleGtk content. | 162 // Setup the BubbleGtk content. |
| 163 GtkWidget* content_widget = gtk_vbox_new(FALSE, ui::kContentAreaSpacing); | 163 GtkWidget* content_widget = gtk_vbox_new(FALSE, ui::kContentAreaSpacing); |
| 164 gtk_container_set_border_width(GTK_CONTAINER(content_widget), | 164 gtk_container_set_border_width(GTK_CONTAINER(content_widget), |
| 165 ui::kContentAreaBorder); | 165 ui::kContentAreaBorder); |
| 166 if (header_label_) { | 166 if (header_label_) { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 theme_provider, this); | 216 theme_provider, this); |
| 217 if (is_modal_) { | 217 if (is_modal_) { |
| 218 gtk_window_set_transient_for(bubble_->GetNativeWindow(), | 218 gtk_window_set_transient_for(bubble_->GetNativeWindow(), |
| 219 browser_window_gtk->GetNativeWindow()); | 219 browser_window_gtk->GetNativeWindow()); |
| 220 gtk_window_set_modal(bubble_->GetNativeWindow(), true); | 220 gtk_window_set_modal(bubble_->GetNativeWindow(), true); |
| 221 gtk_window_set_focus(bubble_->GetNativeWindow(), ok_button_); | 221 gtk_window_set_focus(bubble_->GetNativeWindow(), ok_button_); |
| 222 } else { | 222 } else { |
| 223 gtk_widget_grab_focus(ok_button_); | 223 gtk_widget_grab_focus(ok_button_); |
| 224 } | 224 } |
| 225 } | 225 } |
| OLD | NEW |