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

Side by Side Diff: ui/events/gesture_detection/gesture_provider_config_helper.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: and another rebase 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
« no previous file with comments | « ui/events/event_utils.cc ('k') | ui/gfx/font_render_params_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/events/gesture_detection/gesture_provider_config_helper.h" 5 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
6 6
7 #include "ui/events/gesture_detection/gesture_configuration.h" 7 #include "ui/events/gesture_detection/gesture_configuration.h"
8 #include "ui/gfx/screen.h" 8 #include "ui/gfx/screen.h"
9 9
10 namespace ui { 10 namespace ui {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 config = BuildGestureProviderConfig(*GestureConfiguration::GetInstance()); 83 config = BuildGestureProviderConfig(*GestureConfiguration::GetInstance());
84 break; 84 break;
85 case GestureProviderConfigType::GENERIC_DESKTOP: 85 case GestureProviderConfigType::GENERIC_DESKTOP:
86 config = BuildGestureProviderConfig(GenericDesktopGestureConfiguration()); 86 config = BuildGestureProviderConfig(GenericDesktopGestureConfiguration());
87 break; 87 break;
88 case GestureProviderConfigType::GENERIC_MOBILE: 88 case GestureProviderConfigType::GENERIC_MOBILE:
89 // The default GestureProvider::Config embeds a mobile configuration. 89 // The default GestureProvider::Config embeds a mobile configuration.
90 break; 90 break;
91 } 91 }
92 92
93 gfx::Screen* screen = gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE); 93 gfx::Screen* screen = gfx::Screen::GetScreen();
94 // |screen| is sometimes NULL during tests. 94 // |screen| is sometimes NULL during tests.
95 if (screen) 95 if (screen)
96 config.display = screen->GetPrimaryDisplay(); 96 config.display = screen->GetPrimaryDisplay();
97 97
98 return config; 98 return config;
99 } 99 }
100 100
101 } // namespace ui 101 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/event_utils.cc ('k') | ui/gfx/font_render_params_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698