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

Side by Side Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h"
6 6
7 #include "ash/wm/window_state.h" 7 #include "ash/wm/window_state.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 } 231 }
232 232
233 private: 233 private:
234 aura::Window* root_window_; 234 aura::Window* root_window_;
235 235
236 DISALLOW_COPY_AND_ASSIGN(ScreenEventGeneratorDelegate); 236 DISALLOW_COPY_AND_ASSIGN(ScreenEventGeneratorDelegate);
237 }; 237 };
238 238
239 #endif 239 #endif
240 240
241 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 241 #if !defined(OS_CHROMEOS)
242 242
243 // Following classes verify a crash scenario. Specifically on Windows when focus 243 // Following classes verify a crash scenario. Specifically on Windows when focus
244 // changes it can trigger capture being lost. This was causing a crash in tab 244 // changes it can trigger capture being lost. This was causing a crash in tab
245 // dragging as it wasn't set up to handle this scenario. These classes 245 // dragging as it wasn't set up to handle this scenario. These classes
246 // synthesize this scenario. 246 // synthesize this scenario.
247 247
248 // Allows making ClearNativeFocus() invoke ReleaseCapture(). 248 // Allows making ClearNativeFocus() invoke ReleaseCapture().
249 class TestDesktopBrowserFrameAura : public DesktopBrowserFrameAura { 249 class TestDesktopBrowserFrameAura : public DesktopBrowserFrameAura {
250 public: 250 public:
251 TestDesktopBrowserFrameAura( 251 TestDesktopBrowserFrameAura(
(...skipping 2080 matching lines...) Expand 10 before | Expand all | Expand 10 after
2332 DetachToDockedTabDragControllerTest, 2332 DetachToDockedTabDragControllerTest,
2333 ::testing::Values("mouse", "mouse docked")); 2333 ::testing::Values("mouse", "mouse docked"));
2334 INSTANTIATE_TEST_CASE_P(TabDragging, 2334 INSTANTIATE_TEST_CASE_P(TabDragging,
2335 DetachToBrowserTabDragControllerTestTouch, 2335 DetachToBrowserTabDragControllerTestTouch,
2336 ::testing::Values("touch", "touch docked")); 2336 ::testing::Values("touch", "touch docked"));
2337 #else 2337 #else
2338 INSTANTIATE_TEST_CASE_P(TabDragging, 2338 INSTANTIATE_TEST_CASE_P(TabDragging,
2339 DetachToBrowserTabDragControllerTest, 2339 DetachToBrowserTabDragControllerTest,
2340 ::testing::Values("mouse")); 2340 ::testing::Values("mouse"));
2341 #endif 2341 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698