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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <map> 5 #include <map>
6 #include <vector> 6 #include <vector>
7 7
8 // Include views_test_base.h first because the definition of None in X.h 8 // Include views_test_base.h first because the definition of None in X.h
9 // conflicts with the definition of None in gtest-type-util.h 9 // conflicts with the definition of None in gtest-type-util.h
10 #include "ui/views/test/views_test_base.h" 10 #include "ui/views/test/views_test_base.h"
11 11
12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
13 #include "base/run_loop.h" 14 #include "base/run_loop.h"
14 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
15 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
16 #include "ui/aura/window_tree_host.h" 17 #include "ui/aura/window_tree_host.h"
17 #include "ui/base/dragdrop/os_exchange_data.h" 18 #include "ui/base/dragdrop/os_exchange_data.h"
18 #include "ui/base/x/x11_util.h" 19 #include "ui/base/x/x11_util.h"
19 #include "ui/events/event_utils.h" 20 #include "ui/events/event_utils.h"
20 #include "ui/gfx/x/x11_atom_cache.h" 21 #include "ui/gfx/x/x11_atom_cache.h"
21 #include "ui/gfx/x/x11_types.h" 22 #include "ui/gfx/x/x11_types.h"
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 // the aura::client::DragDropDelegate is properly notified. 955 // the aura::client::DragDropDelegate is properly notified.
955 TEST_F(DesktopDragDropClientAuraX11ChromeSourceTargetTest, CtrlPressed) { 956 TEST_F(DesktopDragDropClientAuraX11ChromeSourceTargetTest, CtrlPressed) {
956 base::MessageLoop::current()->PostTask( 957 base::MessageLoop::current()->PostTask(
957 FROM_HERE, 958 FROM_HERE,
958 base::Bind(&ChromeSourceTargetStep2, client(), ui::EF_CONTROL_DOWN)); 959 base::Bind(&ChromeSourceTargetStep2, client(), ui::EF_CONTROL_DOWN));
959 int result = StartDragAndDrop(); 960 int result = StartDragAndDrop();
960 EXPECT_EQ(ui::DragDropTypes::DRAG_COPY, result); 961 EXPECT_EQ(ui::DragDropTypes::DRAG_COPY, result);
961 } 962 }
962 963
963 } // namespace views 964 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698