diff options
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents_view_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/browser_window_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/find_bar_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/first_run_dialog.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/tab_contents_container_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 4 | ||||
| -rw-r--r-- | ui/base/gtk/gtk_floating_container.cc (renamed from chrome/browser/ui/gtk/gtk_floating_container.cc) | 2 | ||||
| -rw-r--r-- | ui/base/gtk/gtk_floating_container.h (renamed from chrome/browser/ui/gtk/gtk_floating_container.h) | 17 | ||||
| -rw-r--r-- | ui/ui.gyp | 2 |
10 files changed, 19 insertions, 18 deletions
diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc index 4e380a7..808cf44 100644 --- a/chrome/browser/tab_contents/tab_contents_view_gtk.cc +++ b/chrome/browser/tab_contents/tab_contents_view_gtk.cc @@ -18,7 +18,6 @@ #include "chrome/browser/ui/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/constrained_window_gtk.h" #include "chrome/browser/ui/gtk/gtk_expanded_container.h" -#include "chrome/browser/ui/gtk/gtk_floating_container.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/sad_tab_gtk.h" #include "chrome/browser/ui/gtk/tab_contents_drag_source.h" @@ -31,6 +30,7 @@ #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/common/content_notification_types.h" #include "content/common/notification_source.h" +#include "ui/base/gtk/gtk_floating_container.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 3b7219f..9415480 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -54,7 +54,6 @@ #include "chrome/browser/ui/gtk/find_bar_gtk.h" #include "chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h" #include "chrome/browser/ui/gtk/global_menu_bar.h" -#include "chrome/browser/ui/gtk/gtk_floating_container.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h" @@ -91,6 +90,7 @@ #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" #include "grit/ui_resources.h" +#include "ui/base/gtk/gtk_floating_container.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc index 4e446a5..1faed02 100644 --- a/chrome/browser/ui/gtk/find_bar_gtk.cc +++ b/chrome/browser/ui/gtk/find_bar_gtk.cc @@ -23,7 +23,6 @@ #include "chrome/browser/ui/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/cairo_cached_surface.h" #include "chrome/browser/ui/gtk/custom_button.h" -#include "chrome/browser/ui/gtk/gtk_floating_container.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/nine_box.h" @@ -41,6 +40,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "ui/base/gtk/gtk_floating_container.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc index 7bda7b0..3b6fb88 100644 --- a/chrome/browser/ui/gtk/first_run_dialog.cc +++ b/chrome/browser/ui/gtk/first_run_dialog.cc @@ -20,7 +20,6 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" -#include "chrome/browser/ui/gtk/gtk_floating_container.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -29,6 +28,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/gtk/gtk_floating_container.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc index a7d1d14..8197fd26 100644 --- a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" -#include "chrome/browser/ui/gtk/gtk_floating_container.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/rounded_window.h" #include "grit/generated_resources.h" #include "grit/ui_strings.h" +#include "ui/base/gtk/gtk_floating_container.h" #include "ui/base/l10n/l10n_util.h" FullscreenExitBubbleGtk::FullscreenExitBubbleGtk( diff --git a/chrome/browser/ui/gtk/tab_contents_container_gtk.cc b/chrome/browser/ui/gtk/tab_contents_container_gtk.cc index 9eb3f10..2899a31 100644 --- a/chrome/browser/ui/gtk/tab_contents_container_gtk.cc +++ b/chrome/browser/ui/gtk/tab_contents_container_gtk.cc @@ -8,12 +8,12 @@ #include "base/i18n/rtl.h" #include "chrome/browser/ui/gtk/gtk_expanded_container.h" -#include "chrome/browser/ui/gtk/gtk_floating_container.h" #include "chrome/browser/ui/gtk/status_bubble_gtk.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "content/browser/renderer_host/render_widget_host_view_gtk.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_source.h" +#include "ui/base/gtk/gtk_floating_container.h" #include "ui/gfx/native_widget_types.h" TabContentsContainerGtk::TabContentsContainerGtk(StatusBubbleGtk* status_bubble) diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index db2932f..3cf5ceb8 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2837,8 +2837,6 @@ 'browser/ui/gtk/gtk_custom_menu_item.h', 'browser/ui/gtk/gtk_expanded_container.cc', 'browser/ui/gtk/gtk_expanded_container.h', - 'browser/ui/gtk/gtk_floating_container.cc', - 'browser/ui/gtk/gtk_floating_container.h', 'browser/ui/gtk/gtk_theme_service.cc', 'browser/ui/gtk/gtk_theme_service.h', 'browser/ui/gtk/gtk_tree.cc', @@ -4289,8 +4287,6 @@ ['include', '^browser/ui/gtk/gtk_chrome_link_button.cc'], ['include', '^browser/ui/gtk/gtk_chrome_link_button.h'], ['include', '^browser/ui/gtk/gtk_custom_menu_item.cc'], - ['include', '^browser/ui/gtk/gtk_floating_container.cc'], - ['include', '^browser/ui/gtk/gtk_floating_container.h'], ['include', '^browser/ui/gtk/gtk_theme_service.cc'], ['include', '^browser/ui/gtk/gtk_theme_service.h'], ['include', '^browser/ui/gtk/gtk_tree.cc'], diff --git a/chrome/browser/ui/gtk/gtk_floating_container.cc b/ui/base/gtk/gtk_floating_container.cc index 5309fc4..0bda427 100644 --- a/chrome/browser/ui/gtk/gtk_floating_container.cc +++ b/ui/base/gtk/gtk_floating_container.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/gtk/gtk_floating_container.h" +#include "ui/base/gtk/gtk_floating_container.h" #include <gtk/gtk.h> #include <gtk/gtkmarshal.h> diff --git a/chrome/browser/ui/gtk/gtk_floating_container.h b/ui/base/gtk/gtk_floating_container.h index 9b15b74..a6977df 100644 --- a/chrome/browser/ui/gtk/gtk_floating_container.h +++ b/ui/base/gtk/gtk_floating_container.h @@ -2,13 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_GTK_GTK_FLOATING_CONTAINER_H_ -#define CHROME_BROWSER_UI_GTK_GTK_FLOATING_CONTAINER_H_ +#ifndef UI_BASE_GTK_GTK_FLOATING_CONTAINER_H_ +#define UI_BASE_GTK_GTK_FLOATING_CONTAINER_H_ #pragma once #include <gdk/gdk.h> #include <gtk/gtk.h> +#include "ui/base/ui_export.h" + // A specialized container, which is a cross between a GtkBin and a // GtkFixed. This container dervies from GtkBin and the implementation of // gtk_container_add() is the same: only one GtkWidget can be added through @@ -75,13 +77,14 @@ struct _GtkFloatingContainerChild { gint y; }; -GType gtk_floating_container_get_type() G_GNUC_CONST; -GtkWidget* gtk_floating_container_new(); -void gtk_floating_container_add_floating(GtkFloatingContainer* container, - GtkWidget* widget); +UI_EXPORT GType gtk_floating_container_get_type() G_GNUC_CONST; +UI_EXPORT GtkWidget* gtk_floating_container_new(); +UI_EXPORT void gtk_floating_container_add_floating( + GtkFloatingContainer* container, + GtkWidget* widget); // Use gtk_container_remove to remove all widgets; both widgets added with // gtk_container_add() and gtk_floating_container_add_floating(). G_END_DECLS -#endif // CHROME_BROWSER_UI_GTK_GTK_FLOATING_CONTAINER_H_ +#endif // UI_BASE_GTK_GTK_FLOATING_CONTAINER_H_ @@ -106,6 +106,8 @@ 'base/gtk/event_synthesis_gtk.h', 'base/gtk/g_object_destructor_filo.cc', 'base/gtk/g_object_destructor_filo.h', + 'base/gtk/gtk_floating_container.cc', + 'base/gtk/gtk_floating_container.h', 'base/gtk/gtk_im_context_util.cc', 'base/gtk/gtk_im_context_util.h', 'base/gtk/gtk_signal.h', |