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

Side by Side Diff: content/browser/renderer_host/input/web_input_event_unittest.cc

Issue 1965073002: Rename gfx::Display to display::Display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 #include "third_party/WebKit/public/web/WebInputEvent.h" 8 #include "third_party/WebKit/public/web/WebInputEvent.h"
9 #include "ui/display/display.h" 9 #include "ui/display/display.h"
10 #include "ui/display/display_switches.h"
10 #include "ui/events/event_constants.h" 11 #include "ui/events/event_constants.h"
11 #include "ui/gfx/switches.h"
12 12
13 #if defined(OS_WIN) 13 #if defined(OS_WIN)
14 #include "base/win/windows_version.h" 14 #include "base/win/windows_version.h"
15 #include "content/browser/renderer_host/input/web_input_event_builders_win.h" 15 #include "content/browser/renderer_host/input/web_input_event_builders_win.h"
16 #endif 16 #endif
17 17
18 using blink::WebMouseEvent; 18 using blink::WebMouseEvent;
19 using blink::WebMouseWheelEvent; 19 using blink::WebMouseWheelEvent;
20 20
21 namespace content { 21 namespace content {
(...skipping 28 matching lines...) Expand all
50 // WebMouseEvent.globalX and WebMouseEvent.globalY are calculated in DIPs. 50 // WebMouseEvent.globalX and WebMouseEvent.globalY are calculated in DIPs.
51 EXPECT_EQ(150, mouse_move.globalX); 51 EXPECT_EQ(150, mouse_move.globalX);
52 EXPECT_EQ(100, mouse_move.globalY); 52 EXPECT_EQ(100, mouse_move.globalY);
53 53
54 command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1"); 54 command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1");
55 display::Display::ResetForceDeviceScaleFactorForTesting(); 55 display::Display::ResetForceDeviceScaleFactorForTesting();
56 } 56 }
57 #endif 57 #endif
58 58
59 } // namespace content 59 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698