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

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

Issue 226293005: Use platform's device scale factor for cursor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 1867 matching lines...) Expand 10 before | Expand all | Expand 10 after
1878 1878
1879 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 1879 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
1880 DetachToBrowserTabDragControllerTest::SetUpCommandLine(command_line); 1880 DetachToBrowserTabDragControllerTest::SetUpCommandLine(command_line);
1881 command_line->AppendSwitchASCII("ash-host-window-bounds", 1881 command_line->AppendSwitchASCII("ash-host-window-bounds",
1882 "400x400,0+400-800x800*2"); 1882 "400x400,0+400-800x800*2");
1883 } 1883 }
1884 1884
1885 float GetCursorDeviceScaleFactor() const { 1885 float GetCursorDeviceScaleFactor() const {
1886 ash::test::CursorManagerTestApi cursor_test_api( 1886 ash::test::CursorManagerTestApi cursor_test_api(
1887 ash::Shell::GetInstance()->cursor_manager()); 1887 ash::Shell::GetInstance()->cursor_manager());
1888 return cursor_test_api.GetDisplay().device_scale_factor(); 1888 return cursor_test_api.GetCurrentCursor().device_scale_factor();
1889 } 1889 }
1890 1890
1891 private: 1891 private:
1892 DISALLOW_COPY_AND_ASSIGN( 1892 DISALLOW_COPY_AND_ASSIGN(
1893 DifferentDeviceScaleFactorDisplayTabDragControllerTest); 1893 DifferentDeviceScaleFactorDisplayTabDragControllerTest);
1894 }; 1894 };
1895 1895
1896 namespace { 1896 namespace {
1897 1897
1898 // The points where a tab is dragged in CursorDeviceScaleFactorStep. 1898 // The points where a tab is dragged in CursorDeviceScaleFactorStep.
(...skipping 433 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

Powered by Google App Engine
This is Rietveld 408576698