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

Side by Side Diff: trunk/src/ash/drag_drop/drag_drop_interactive_uitest.cc

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ash/drag_drop/drag_drop_controller.h" 5 #include "ash/drag_drop/drag_drop_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 PathService::Get(base::DIR_MODULE, &resources_pack_path); 135 PathService::Get(base::DIR_MODULE, &resources_pack_path);
136 resources_pack_path = 136 resources_pack_path =
137 resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak")); 137 resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak"));
138 ResourceBundle::GetSharedInstance().AddDataPackFromPath( 138 ResourceBundle::GetSharedInstance().AddDataPackFromPath(
139 resources_pack_path, ui::SCALE_FACTOR_NONE); 139 resources_pack_path, ui::SCALE_FACTOR_NONE);
140 140
141 test::AshTestBase::SetUp(); 141 test::AshTestBase::SetUp();
142 } 142 }
143 }; 143 };
144 144
145 #if !defined(OS_CHROMEOS) 145 #if defined(OS_WIN)
146 #define MAYBE_DragDropAcrossMultiDisplay DISABLED_DragDropAcrossMultiDisplay 146 #define MAYBE_DragDropAcrossMultiDisplay DISABLED_DragDropAcrossMultiDisplay
147 #else 147 #else
148 #define MAYBE_DragDropAcrossMultiDisplay DragDropAcrossMultiDisplay 148 #define MAYBE_DragDropAcrossMultiDisplay DragDropAcrossMultiDisplay
149 #endif 149 #endif
150 150
151 // Test if the mouse gets moved properly to another display 151 // Test if the mouse gets moved properly to another display
152 // during drag & drop operation. 152 // during drag & drop operation.
153 TEST_F(DragDropTest, MAYBE_DragDropAcrossMultiDisplay) { 153 TEST_F(DragDropTest, MAYBE_DragDropAcrossMultiDisplay) {
154 if (!SupportsMultipleDisplays()) 154 if (!SupportsMultipleDisplays())
155 return; 155 return;
(...skipping 21 matching lines...) Expand all
177 177
178 base::MessageLoop::current()->Run(); 178 base::MessageLoop::current()->Run();
179 179
180 EXPECT_TRUE(target_view->dropped()); 180 EXPECT_TRUE(target_view->dropped());
181 181
182 source->Close(); 182 source->Close();
183 target->Close(); 183 target->Close();
184 } 184 }
185 185
186 } // namespace ash 186 } // namespace ash
OLDNEW
« no previous file with comments | « trunk/src/ash/display/display_controller.cc ('k') | trunk/src/ash/host/ash_window_tree_host_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698