summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 00:46:42 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 00:46:42 +0000
commitd9646d2805844990e1c9d79d69c06fd502fb5783 (patch)
tree5086f93061d3a3dc0dbe1472410b767ba38249b9 /chrome/browser/renderer_host
parent97c29575ab1cc3b1bcb53449c3d9627ee1382d04 (diff)
downloadchromium_src-d9646d2805844990e1c9d79d69c06fd502fb5783.zip
chromium_src-d9646d2805844990e1c9d79d69c06fd502fb5783.tar.gz
chromium_src-d9646d2805844990e1c9d79d69c06fd502fb5783.tar.bz2
views: Move ime and test directories to ui/views.
BUG=104039 R=ben@chromium.org Review URL: http://codereview.chromium.org/8581003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_views.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index 3a4a9f5..b5ab500 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc
@@ -31,8 +31,8 @@
#include "ui/base/text/text_elider.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/canvas_skia.h"
+#include "ui/views/ime/input_method.h"
#include "views/events/event.h"
-#include "views/ime/input_method.h"
#include "views/views_delegate.h"
#include "views/widget/tooltip_manager.h"
#include "views/widget/widget.h"
@@ -46,9 +46,10 @@
#endif
#if defined(TOOLKIT_USES_GTK)
+#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <gtk/gtkwindow.h>
-#include <gdk/gdkx.h>
+
#include "content/browser/renderer_host/gtk_window_utils.h"
#include "views/widget/native_widget_gtk.h"
#endif