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

Side by Side Diff: ui/display/screen.cc

Issue 2688413007: Add display::GetDisplayNearestView (Closed)
Patch Set: add missing files Created 3 years, 10 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "ui/display/screen.h" 5 #include "ui/display/screen.h"
6 6
7 #include "ui/display/display.h" 7 #include "ui/display/display.h"
8 #include "ui/gfx/geometry/rect.h" 8 #include "ui/gfx/geometry/rect.h"
9 #include "ui/gfx/view_util.h"
tapted 2017/02/15 00:36:10 is this needed?
Jinsuk Kim 2017/02/16 10:11:25 Removed.
9 10
10 namespace display { 11 namespace display {
11 12
12 namespace { 13 namespace {
13 14
14 Screen* g_screen; 15 Screen* g_screen;
15 16
16 } // namespace 17 } // namespace
17 18
18 Screen::Screen() {} 19 Screen::Screen() {}
19 20
20 Screen::~Screen() {} 21 Screen::~Screen() {}
21 22
22 // static 23 // static
23 Screen* Screen::GetScreen() { 24 Screen* Screen::GetScreen() {
24 #if defined(OS_MACOSX) 25 #if defined(OS_MACOSX)
25 // TODO(scottmg): https://crbug.com/558054 26 // TODO(scottmg): https://crbug.com/558054
26 if (!g_screen) 27 if (!g_screen)
27 g_screen = CreateNativeScreen(); 28 g_screen = CreateNativeScreen();
28 #endif 29 #endif
29 return g_screen; 30 return g_screen;
30 } 31 }
31 32
32 // static 33 // static
33 void Screen::SetScreenInstance(Screen* instance) { 34 void Screen::SetScreenInstance(Screen* instance) {
34 g_screen = instance; 35 g_screen = instance;
35 } 36 }
36 37
37 gfx::Rect Screen::ScreenToDIPRectInWindow(gfx::NativeView view, 38 gfx::Rect Screen::ScreenToDIPRectInWindow(gfx::NativeWindow window,
38 const gfx::Rect& screen_rect) const { 39 const gfx::Rect& screen_rect) const {
39 float scale = GetDisplayNearestWindow(view).device_scale_factor(); 40 float scale = GetDisplayNearestWindow(window).device_scale_factor();
40 return ScaleToEnclosingRect(screen_rect, 1.0f / scale); 41 return ScaleToEnclosingRect(screen_rect, 1.0f / scale);
41 } 42 }
42 43
43 gfx::Rect Screen::DIPToScreenRectInWindow(gfx::NativeView view, 44 gfx::Rect Screen::DIPToScreenRectInWindow(gfx::NativeWindow window,
44 const gfx::Rect& dip_rect) const { 45 const gfx::Rect& dip_rect) const {
45 float scale = GetDisplayNearestWindow(view).device_scale_factor(); 46 float scale = GetDisplayNearestWindow(window).device_scale_factor();
46 return ScaleToEnclosingRect(dip_rect, scale); 47 return ScaleToEnclosingRect(dip_rect, scale);
47 } 48 }
48 49
49 bool Screen::GetDisplayWithDisplayId(int64_t display_id, 50 bool Screen::GetDisplayWithDisplayId(int64_t display_id,
50 Display* display) const { 51 Display* display) const {
51 for (const Display& display_in_list : GetAllDisplays()) { 52 for (const Display& display_in_list : GetAllDisplays()) {
52 if (display_in_list.id() == display_id) { 53 if (display_in_list.id() == display_id) {
53 *display = display_in_list; 54 *display = display_in_list;
54 return true; 55 return true;
55 } 56 }
56 } 57 }
57 return false; 58 return false;
58 } 59 }
59 60
60 } // namespace display 61 } // namespace display
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698