diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 18:10:18 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 18:10:18 +0000 |
| commit | 3c56b38d2055b16592d499ea4933c27cbb0fd809 (patch) | |
| tree | 82c593ce4c84e4d0c538d10cd89da3f001ac67c7 /chrome/browser/ui/gtk/tabs | |
| parent | 03eb9d27a79f876a039ca30eba54d1155ab5500b (diff) | |
| download | chromium_src-3c56b38d2055b16592d499ea4933c27cbb0fd809.zip chromium_src-3c56b38d2055b16592d499ea4933c27cbb0fd809.tar.gz chromium_src-3c56b38d2055b16592d499ea4933c27cbb0fd809.tar.bz2 | |
content: Move render_widget_host_view_gtk to content/ try 2.
This was r97750, which was reverted at r97756. This patch, in addition to all
the other things it did, marks OwnedWidgetGtk for export and moves it to the
ui:: namespace.
Original list of things this patch does:
- OwnedWidgetGtk now goes in ui/base/gtk/
- TruncateString moved from l10n_util:: to ui::
- GtkIMContextWrapper has part of its code split into chrome/ (IDC using code goes in RenderViewContextMenu) and the rest go in content/ (gtk using code goes with GtkIMContextWrapper).
- gtk_key_bindings_handler[_unittest] now goes in content, as it's a utility class to RenderWidgetHostGtk.
BUG=93804
TEST=existing unit tests
Original Review URL: http://codereview.chromium.org/7669040
Review URL: http://codereview.chromium.org/7708021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/tabs')
| -rw-r--r-- | chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/tabs/tab_strip_gtk.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h index 2ea309e..a1ce55b 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h @@ -12,12 +12,12 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "chrome/browser/ui/gtk/owned_widget_gtk.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/gtk/owned_widget_gtk.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/rect.h" @@ -395,7 +395,7 @@ class TabRendererGtk : public ui::AnimationDelegate, static SkColor unselected_title_color_; // The GtkDrawingArea we draw the tab on. - OwnedWidgetGtk tab_; + ui::OwnedWidgetGtk tab_; // Whether we're showing the icon. It is cached so that we can detect when it // changes and layout appropriately. diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h index 98c7a85..2eeb501 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h @@ -13,13 +13,13 @@ #include "base/message_loop.h" #include "base/task.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/browser/ui/gtk/owned_widget_gtk.h" #include "chrome/browser/ui/gtk/tabs/tab_gtk.h" #include "chrome/browser/ui/gtk/tabstrip_origin_provider.h" #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/browser/ui/tabs/hover_tab_selector.h" #include "content/common/notification_observer.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/gtk/owned_widget_gtk.h" #include "ui/gfx/rect.h" class BrowserWindowGtk; @@ -424,7 +424,7 @@ class TabStripGtk : public TabStripModelObserver, bool needs_resize_layout_; // The GtkFixed widget. - OwnedWidgetGtk tabstrip_; + ui::OwnedWidgetGtk tabstrip_; // The bounds of the tabstrip. gfx::Rect bounds_; |