Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(973)

Unified Diff: views/view_unittest.cc

Issue 8568022: views: Move desktop and touchui directories to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/touchui/touch_selection_controller_impl_unittest.cc ('k') | views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/view_unittest.cc
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index c4a5256e8147e4c3cad04d1aa3e13e3a8740a574..e60f4bbbdcda49fb4c0e075db90903aeb5abdf83 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -11,8 +11,8 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/base/models/simple_menu_model.h"
#include "ui/base/models/accelerator.h"
+#include "ui/base/models/simple_menu_model.h"
#include "ui/gfx/canvas_skia.h"
#include "ui/gfx/compositor/compositor.h"
#include "ui/gfx/compositor/layer.h"
@@ -21,6 +21,7 @@
#include "ui/gfx/compositor/test_texture.h"
#include "ui/gfx/path.h"
#include "ui/gfx/transform.h"
+#include "ui/views/touchui/gesture_manager.h"
#include "ui/views/window/dialog_delegate.h"
#include "views/background.h"
#include "views/controls/button/button_dropdown.h"
@@ -32,7 +33,6 @@
#include "views/focus/accelerator_handler.h"
#include "views/focus/view_storage.h"
#include "views/test/views_test_base.h"
-#include "views/touchui/gesture_manager.h"
#include "views/view.h"
#include "views/views_delegate.h"
#include "views/widget/native_widget.h"
« no previous file with comments | « views/touchui/touch_selection_controller_impl_unittest.cc ('k') | views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698