ui/base/layout.cc - Issue 1608733002: Remove ui/gfx/screen_type_delegate.h

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/base/layout.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4

Patch Set: GetNativeScreen Created 4 years, 11 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

« chrome/browser/ui/views/tabs/window_finder_x11.cc ('K') | « ui/aura/window_unittest.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | ui/views/widget/desktop_aura/x11_window_event_filter.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "ui/base/layout.h"	5 #include "ui/base/layout.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8	8

9 #include <algorithm>	9 #include <algorithm>

10 #include <cmath>	10 #include <cmath>

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
108 } else {	108 } else {

109 delete g_supported_scale_factors;	109 delete g_supported_scale_factors;

110 g_supported_scale_factors = NULL;	110 g_supported_scale_factors = NULL;

111 }	111 }

112 }	112 }

113	113

114 } // namespace test	114 } // namespace test

115	115

116 #if !defined(OS_MACOSX)	116 #if !defined(OS_MACOSX)

117 float GetScaleFactorForNativeView(gfx::NativeView view) {	117 float GetScaleFactorForNativeView(gfx::NativeView view) {

118 gfx::Screen* screen = gfx::Screen::GetScreenFor(view);	118 gfx::Screen* screen = gfx::Screen::GetScreen();

119 gfx::Display display = screen->GetDisplayNearestWindow(view);	119 gfx::Display display = screen->GetDisplayNearestWindow(view);
	oshima 2016/01/19 20:44:31 single line? single line? scottmg 2016/01/19 21:55:57 Done. Show quoted text On 2016/01/19 20:44:31, oshima wrote: > single line? Done.
120 return display.device_scale_factor();	120 return display.device_scale_factor();

121 }	121 }

122 #endif // !defined(OS_MACOSX)	122 #endif // !defined(OS_MACOSX)

123	123

124 } // namespace ui	124 } // namespace ui

OLD	NEW