summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 20:17:13 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 20:17:13 +0000
commit916dc1cd1eefef35cebad43129ff7d8c6f2ba98c (patch)
tree61f8a09ab9d425afeaf274b31692b39d51aaa0d1 /content
parentd8472d9319e50a399f20c7e9b54255450b46844d (diff)
downloadchromium_src-916dc1cd1eefef35cebad43129ff7d8c6f2ba98c.zip
chromium_src-916dc1cd1eefef35cebad43129ff7d8c6f2ba98c.tar.gz
chromium_src-916dc1cd1eefef35cebad43129ff7d8c6f2ba98c.tar.bz2
Move TooltipWindowGtk from views/widget to ui/base/gtk.
TooltipWidgetGtk is a gtk based helper class that replaces a widget's default tooltip with a RGBA friendly version. It's not closely coupled with views and ui/base/gtk seems to be a better home for it. This move gets rid of RenderWidgetHostViewGtk's dependency on views. BUG=none. TEST=Expect no change. ChromeOS's tooltip should still have rounded corners. Review URL: http://codereview.chromium.org/7753038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_widget_host_view_gtk.cc4
-rw-r--r--content/browser/renderer_host/render_widget_host_view_gtk.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc
index 0e7733e..4f87812 100644
--- a/content/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -45,7 +45,7 @@
#include "webkit/plugins/npapi/webplugin.h"
#if defined(OS_CHROMEOS)
-#include "views/widget/tooltip_window_gtk.h"
+#include "ui/base/gtk/tooltip_window_gtk.h"
#else
#include "content/browser/renderer_host/gtk_key_bindings_handler.h"
#endif // defined(OS_CHROMEOS)
@@ -901,7 +901,7 @@ void RenderWidgetHostViewGtk::DoSharedInit() {
im_context_.reset(new GtkIMContextWrapper(this));
plugin_container_manager_.set_host_widget(view_.get());
#if defined(OS_CHROMEOS)
- tooltip_window_.reset(new views::TooltipWindowGtk(view_.get()));
+ tooltip_window_.reset(new ui::TooltipWindowGtk(view_.get()));
#else
key_bindings_handler_.reset(new GtkKeyBindingsHandler(view_.get()));
#endif
diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.h b/content/browser/renderer_host/render_widget_host_view_gtk.h
index 1aa159a..43973f7 100644
--- a/content/browser/renderer_host/render_widget_host_view_gtk.h
+++ b/content/browser/renderer_host/render_widget_host_view_gtk.h
@@ -28,7 +28,7 @@ class GtkIMContextWrapper;
struct NativeWebKeyboardEvent;
#if defined(OS_CHROMEOS)
-namespace views {
+namespace ui {
class TooltipWindowGtk;
}
#else
@@ -269,7 +269,7 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView,
#if defined(OS_CHROMEOS)
// Custimized tooltip window.
- scoped_ptr<views::TooltipWindowGtk> tooltip_window_;
+ scoped_ptr<ui::TooltipWindowGtk> tooltip_window_;
#endif // defined(OS_CHROMEOS)
};