summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc3
-rw-r--r--chrome/browser/ui/gtk/bubble/bubble_gtk.cc3
-rw-r--r--chrome/browser/ui/gtk/constrained_window_gtk.cc3
-rw-r--r--chrome/browser/ui/gtk/gtk_chrome_link_button.cc3
-rw-r--r--chrome/browser/ui/gtk/gtk_util.cc13
-rw-r--r--chrome/browser/ui/gtk/hover_controller_gtk.cc3
-rw-r--r--chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc5
-rw-r--r--chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc7
-rw-r--r--chrome/browser/ui/gtk/rounded_window.cc3
-rw-r--r--chrome/browser/ui/gtk/ssl_client_certificate_selector.cc3
-rw-r--r--chrome/browser/ui/gtk/status_bubble_gtk.cc9
-rw-r--r--chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc3
-rw-r--r--chrome/browser/ui/login/login_prompt_gtk.cc3
13 files changed, 37 insertions, 24 deletions
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index f1fe047..7919aca 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -37,6 +37,7 @@
#include "grit/theme_resources.h"
#include "grit/theme_resources_standard.h"
#include "grit/ui_resources.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/gfx/canvas_skia_paint.h"
#include "ui/gfx/gtk_util.h"
@@ -802,7 +803,7 @@ gboolean BrowserActionsToolbarGtk::OnDragFailed(GtkWidget* widget,
void BrowserActionsToolbarGtk::OnHierarchyChanged(
GtkWidget* widget, GtkWidget* previous_toplevel) {
GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
- if (!GTK_WIDGET_TOPLEVEL(toplevel))
+ if (!gtk_widget_is_toplevel(toplevel))
return;
signals_.Connect(toplevel, "set-focus", G_CALLBACK(OnSetFocusThunk), this);
diff --git a/chrome/browser/ui/gtk/bubble/bubble_gtk.cc b/chrome/browser/ui/gtk/bubble/bubble_gtk.cc
index 089dae6..4af8597 100644
--- a/chrome/browser/ui/gtk/bubble/bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/bubble/bubble_gtk.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/ui/gtk/gtk_util.h"
#include "chrome/common/chrome_notification_types.h"
#include "content/public/browser/notification_source.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_hig_constants.h"
#include "ui/base/gtk/gtk_windowing.h"
#include "ui/gfx/gtk_util.h"
@@ -100,7 +101,7 @@ void BubbleGtk::Init(GtkWidget* anchor_widget,
DCHECK(!window_);
anchor_widget_ = anchor_widget;
toplevel_window_ = GTK_WINDOW(gtk_widget_get_toplevel(anchor_widget_));
- DCHECK(GTK_WIDGET_TOPLEVEL(toplevel_window_));
+ DCHECK(gtk_widget_is_toplevel(GTK_WIDGET(toplevel_window_)));
rect_ = rect ? *rect : gtk_util::WidgetBounds(anchor_widget);
preferred_arrow_location_ = arrow_location;
diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc
index a6f7c21..9d9f23f 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/browser_thread.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_hig_constants.h"
#if defined(TOUCH_UI)
@@ -163,7 +164,7 @@ gboolean ConstrainedWindowGtk::OnKeyPress(GtkWidget* sender,
void ConstrainedWindowGtk::OnHierarchyChanged(GtkWidget* sender,
GtkWidget* previous_toplevel) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (!GTK_WIDGET_TOPLEVEL(gtk_widget_get_toplevel(widget())))
+ if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget())))
return;
FocusConstrainedWindow();
diff --git a/chrome/browser/ui/gtk/gtk_chrome_link_button.cc b/chrome/browser/ui/gtk/gtk_chrome_link_button.cc
index 2a3bf83..12bd5bb 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_link_button.cc
+++ b/chrome/browser/ui/gtk/gtk_chrome_link_button.cc
@@ -7,6 +7,7 @@
#include <stdlib.h>
#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/gfx/gtk_util.h"
static const gchar* kLinkMarkup = "<u><span color=\"%s\">%s</span></u>";
@@ -54,7 +55,7 @@ G_DEFINE_TYPE(GtkChromeLinkButton, gtk_chrome_link_button, GTK_TYPE_BUTTON)
static void gtk_chrome_link_button_set_text(GtkChromeLinkButton* button) {
// If we were called before we were realized, abort. We'll be called for
// real when |button| is realized.
- if (!GTK_WIDGET_REALIZED(button))
+ if (!gtk_widget_get_realized(GTK_WIDGET(button)))
return;
g_free(button->native_markup);
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index b5fa941..b00c062 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -37,6 +37,7 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/events.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_hig_constants.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -101,7 +102,7 @@ gboolean OnMouseButtonReleased(GtkWidget* widget, GdkEventButton* event,
// Returns the approximate number of characters that can horizontally fit in
// |pixel_width| pixels.
int GetCharacterWidthForPixels(GtkWidget* widget, int pixel_width) {
- DCHECK(GTK_WIDGET_REALIZED(widget))
+ DCHECK(gtk_widget_get_realized(widget))
<< " widget must be realized to compute font metrics correctly";
PangoContext* context = gtk_widget_create_pango_context(widget);
@@ -274,7 +275,7 @@ GtkWidget* CreateBoldLabel(const std::string& text) {
void GetWidgetSizeFromCharacters(
GtkWidget* widget, double width_chars, double height_lines,
int* width, int* height) {
- DCHECK(GTK_WIDGET_REALIZED(widget))
+ DCHECK(gtk_widget_get_realized(widget))
<< " widget must be realized to compute font metrics correctly";
PangoContext* context = gtk_widget_create_pango_context(widget);
PangoFontMetrics* metrics = pango_context_get_metrics(context,
@@ -297,7 +298,7 @@ void GetWidgetSizeFromCharacters(
void GetWidgetSizeFromResources(
GtkWidget* widget, int width_chars, int height_lines,
int* width, int* height) {
- DCHECK(GTK_WIDGET_REALIZED(widget))
+ DCHECK(gtk_widget_get_realized(widget))
<< " widget must be realized to compute font metrics correctly";
double chars = 0;
@@ -841,11 +842,11 @@ void SetAlwaysShowImage(GtkWidget* image_menu_item) {
}
gfx::Rect GetWidgetRectRelativeToToplevel(GtkWidget* widget) {
- DCHECK(GTK_WIDGET_REALIZED(widget));
+ DCHECK(gtk_widget_get_realized(widget));
GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
DCHECK(toplevel);
- DCHECK(GTK_WIDGET_REALIZED(toplevel));
+ DCHECK(gtk_widget_get_realized(toplevel));
gint x = 0, y = 0;
gtk_widget_translate_coordinates(widget,
@@ -1145,7 +1146,7 @@ void SetLabelWidth(GtkWidget* label, int pixel_width) {
gtk_widget_set_size_request(label, pixel_width, -1);
} else {
// The label has to be realized before we can adjust its width.
- if (GTK_WIDGET_REALIZED(label)) {
+ if (gtk_widget_get_realized(label)) {
OnLabelRealize(label, GINT_TO_POINTER(pixel_width));
} else {
g_signal_connect(label, "realize", G_CALLBACK(OnLabelRealize),
diff --git a/chrome/browser/ui/gtk/hover_controller_gtk.cc b/chrome/browser/ui/gtk/hover_controller_gtk.cc
index f110ad8..d58a05a 100644
--- a/chrome/browser/ui/gtk/hover_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/hover_controller_gtk.cc
@@ -6,6 +6,7 @@
#include "base/message_loop.h"
#include "chrome/browser/ui/gtk/gtk_chrome_button.h"
+#include "ui/base/gtk/gtk_compat.h"
static const gchar* kHoverControllerGtkKey = "__HOVER_CONTROLLER_GTK__";
@@ -114,7 +115,7 @@ void HoverControllerGtk::OnHierarchyChanged(GtkWidget* widget,
GtkWidget* previous_toplevel) {
// GTK+ does not emit leave-notify-event signals when a widget
// becomes unanchored, so manually unset the hover states.
- if (!GTK_WIDGET_TOPLEVEL(gtk_widget_get_toplevel(widget))) {
+ if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget))) {
gtk_widget_set_state(button_, GTK_STATE_NORMAL);
hover_animation_.Reset();
gtk_chrome_button_set_hover_state(GTK_CHROME_BUTTON(button_), 0.0);
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc
index 5cf9267..441b812 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc
@@ -28,6 +28,7 @@
#include "chrome/common/chrome_notification_types.h"
#include "content/public/browser/notification_source.h"
#include "grit/theme_resources.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_hig_constants.h"
#include "ui/base/gtk/gtk_windowing.h"
#include "ui/gfx/color_utils.h"
@@ -365,7 +366,7 @@ void OmniboxPopupViewGtk::UpdatePopupAppearance() {
}
gfx::Rect OmniboxPopupViewGtk::GetTargetBounds() {
- if (!GTK_WIDGET_REALIZED(window_))
+ if (!gtk_widget_get_realized(window_))
return gfx::Rect();
gfx::Rect retval = gtk_util::GetWidgetScreenBounds(window_);
@@ -461,7 +462,7 @@ void OmniboxPopupViewGtk::StackWindow() {
gfx::NativeView omnibox_view = omnibox_view_->GetNativeView();
DCHECK(GTK_IS_WIDGET(omnibox_view));
GtkWidget* toplevel = gtk_widget_get_toplevel(omnibox_view);
- DCHECK(GTK_WIDGET_TOPLEVEL(toplevel));
+ DCHECK(gtk_widget_is_toplevel(toplevel));
ui::StackPopupWindow(window_, toplevel);
}
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
index 6ea2a4a..6d03644 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
@@ -36,6 +36,7 @@
#include "ui/base/animation/multi_animation.h"
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/dragdrop/gtk_dnd_util.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_hig_constants.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -763,7 +764,7 @@ gfx::NativeView OmniboxViewGtk::GetNativeView() const {
gfx::NativeView OmniboxViewGtk::GetRelativeWindowForPopup() const {
GtkWidget* toplevel = gtk_widget_get_toplevel(GetNativeView());
- DCHECK(GTK_WIDGET_TOPLEVEL(toplevel));
+ DCHECK(gtk_widget_is_toplevel(toplevel));
return toplevel;
}
@@ -1932,7 +1933,7 @@ void OmniboxViewGtk::SelectAllInternal(bool reversed,
}
void OmniboxViewGtk::StartUpdatingHighlightedText() {
- if (GTK_WIDGET_REALIZED(text_view_)) {
+ if (gtk_widget_get_realized(text_view_)) {
GtkClipboard* clipboard =
gtk_widget_get_clipboard(text_view_, GDK_SELECTION_PRIMARY);
DCHECK(clipboard);
@@ -1944,7 +1945,7 @@ void OmniboxViewGtk::StartUpdatingHighlightedText() {
}
void OmniboxViewGtk::FinishUpdatingHighlightedText() {
- if (GTK_WIDGET_REALIZED(text_view_)) {
+ if (gtk_widget_get_realized(text_view_)) {
GtkClipboard* clipboard =
gtk_widget_get_clipboard(text_view_, GDK_SELECTION_PRIMARY);
DCHECK(clipboard);
diff --git a/chrome/browser/ui/gtk/rounded_window.cc b/chrome/browser/ui/gtk/rounded_window.cc
index 03d98d6..ca72c38 100644
--- a/chrome/browser/ui/gtk/rounded_window.cc
+++ b/chrome/browser/ui/gtk/rounded_window.cc
@@ -10,6 +10,7 @@
#include "base/i18n/rtl.h"
#include "base/logging.h"
#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_signal_registrar.h"
namespace gtk_util {
@@ -286,7 +287,7 @@ void ActAsRoundedWindow(
void StopActingAsRoundedWindow(GtkWidget* widget) {
g_object_set_data(G_OBJECT(widget), kRoundedData, NULL);
- if (GTK_WIDGET_REALIZED(widget))
+ if (gtk_widget_get_realized(widget))
gdk_window_shape_combine_mask(widget->window, NULL, 0, 0);
if (gtk_widget_get_visible(widget))
diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
index 229fcf9..f320cbf 100644
--- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
+++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
@@ -24,6 +24,7 @@
#include "content/public/browser/browser_thread.h"
#include "grit/generated_resources.h"
#include "net/base/x509_certificate.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_hig_constants.h"
#include "ui/base/gtk/gtk_signal.h"
#include "ui/base/gtk/owned_widget_gtk.h"
@@ -383,7 +384,7 @@ void SSLClientCertificateSelector::OnOkClicked(GtkWidget* button) {
void SSLClientCertificateSelector::OnPromptShown(GtkWidget* widget,
GtkWidget* previous_toplevel) {
if (!root_widget_.get() ||
- !GTK_WIDGET_TOPLEVEL(gtk_widget_get_toplevel(root_widget_.get())))
+ !gtk_widget_is_toplevel(gtk_widget_get_toplevel(root_widget_.get())))
return;
gtk_widget_set_can_default(select_button_, TRUE);
gtk_widget_grab_default(select_button_);
diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.cc b/chrome/browser/ui/gtk/status_bubble_gtk.cc
index f081ff7..7d113ea 100644
--- a/chrome/browser/ui/gtk/status_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/status_bubble_gtk.cc
@@ -18,6 +18,7 @@
#include "chrome/common/chrome_notification_types.h"
#include "content/public/browser/notification_source.h"
#include "ui/base/animation/slide_animation.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_hig_constants.h"
#include "ui/base/text/text_elider.h"
@@ -93,7 +94,7 @@ void StatusBubbleGtk::SetStatusTextToURL() {
GtkWidget* parent = gtk_widget_get_parent(container_.get());
// It appears that parent can be NULL (probably only during shutdown).
- if (!parent || !GTK_WIDGET_REALIZED(parent))
+ if (!parent || !gtk_widget_get_realized(parent))
return;
int desired_width = parent->allocation.width;
@@ -166,11 +167,11 @@ void StatusBubbleGtk::MouseMoved(
last_mouse_location_ = location;
last_mouse_left_content_ = left_content;
- if (!GTK_WIDGET_REALIZED(container_.get()))
+ if (!gtk_widget_get_realized(container_.get()))
return;
GtkWidget* parent = gtk_widget_get_parent(container_.get());
- if (!parent || !GTK_WIDGET_REALIZED(parent))
+ if (!parent || !gtk_widget_get_realized(parent))
return;
int old_y_offset = y_offset_;
@@ -181,7 +182,7 @@ void StatusBubbleGtk::MouseMoved(
y_offset_ = 0;
} else {
GtkWidget* toplevel = gtk_widget_get_toplevel(container_.get());
- if (!toplevel || !GTK_WIDGET_REALIZED(toplevel))
+ if (!toplevel || !gtk_widget_get_realized(toplevel))
return;
bool ltr = !base::i18n::IsRTL();
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
index fe528fe..a6259b8 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
@@ -34,6 +34,7 @@
#include "ui/base/animation/animation_delegate.h"
#include "ui/base/animation/slide_animation.h"
#include "ui/base/dragdrop/gtk_dnd_util.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_screen_utils.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/gtk_util.h"
@@ -1611,7 +1612,7 @@ bool TabStripGtk::IsCursorInTabStripZone() const {
}
void TabStripGtk::ReStack() {
- if (!GTK_WIDGET_REALIZED(tabstrip_.get())) {
+ if (!gtk_widget_get_realized(tabstrip_.get())) {
// If the window isn't realized yet, we can't stack them yet. It will be
// done by the OnMap signal handler.
return;
diff --git a/chrome/browser/ui/login/login_prompt_gtk.cc b/chrome/browser/ui/login/login_prompt_gtk.cc
index 1070117..e16856c 100644
--- a/chrome/browser/ui/login/login_prompt_gtk.cc
+++ b/chrome/browser/ui/login/login_prompt_gtk.cc
@@ -22,6 +22,7 @@
#include "content/public/browser/browser_thread.h"
#include "grit/generated_resources.h"
#include "net/url_request/url_request.h"
+#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_hig_constants.h"
#include "ui/base/gtk/gtk_signal.h"
#include "ui/base/l10n/l10n_util.h"
@@ -177,7 +178,7 @@ void LoginHandlerGtk::OnPromptHierarchyChanged(GtkWidget* sender,
GtkWidget* previous_toplevel) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (!GTK_WIDGET_TOPLEVEL(gtk_widget_get_toplevel(ok_)))
+ if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(ok_)))
return;
// Now that we have attached ourself to the window, we can make our OK
generated by cgit v1.1 at 2025-02-19 14:00:20 +0000