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

Side by Side Diff: ui/display/test/display_manager_test_api.cc

Issue 2445293002: Make the virtual keyboard show up on the display with input focus. (Closed)
Patch Set: fix one more compilation error on Windows Created 4 years 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/display/test/display_manager_test_api.h ('k') | ui/keyboard/BUILD.gn » ('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 (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/display/test/display_manager_test_api.h" 5 #include "ui/display/test/display_manager_test_api.h"
6 6
7 #include <cstdarg> 7 #include <cstdarg>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 } 131 }
132 const ManagedDisplayInfo& info = display_manager_->GetDisplayInfo(id); 132 const ManagedDisplayInfo& info = display_manager_->GetDisplayInfo(id);
133 133
134 scoped_refptr<ManagedDisplayMode> mode = 134 scoped_refptr<ManagedDisplayMode> mode =
135 GetDisplayModeForUIScale(info, ui_scale); 135 GetDisplayModeForUIScale(info, ui_scale);
136 if (!mode) 136 if (!mode)
137 return false; 137 return false;
138 return display_manager_->SetDisplayMode(id, mode); 138 return display_manager_->SetDisplayMode(id, mode);
139 } 139 }
140 140
141 void DisplayManagerTestApi::SetTouchSupport(
142 int64_t display_id,
143 display::Display::TouchSupport touch_support) {
144 display_manager_->FindDisplayForId(display_id)
145 ->set_touch_support(touch_support);
146 }
147
141 ScopedDisable125DSFForUIScaling::ScopedDisable125DSFForUIScaling() { 148 ScopedDisable125DSFForUIScaling::ScopedDisable125DSFForUIScaling() {
142 ManagedDisplayInfo::SetUse125DSFForUIScalingForTest(false); 149 ManagedDisplayInfo::SetUse125DSFForUIScalingForTest(false);
143 } 150 }
144 151
145 ScopedDisable125DSFForUIScaling::~ScopedDisable125DSFForUIScaling() { 152 ScopedDisable125DSFForUIScaling::~ScopedDisable125DSFForUIScaling() {
146 ManagedDisplayInfo::SetUse125DSFForUIScalingForTest(true); 153 ManagedDisplayInfo::SetUse125DSFForUIScalingForTest(true);
147 } 154 }
148 155
149 ScopedSetInternalDisplayId::ScopedSetInternalDisplayId( 156 ScopedSetInternalDisplayId::ScopedSetInternalDisplayId(
150 DisplayManager* display_manager, 157 DisplayManager* display_manager,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 for (size_t i = 0; i < count; i++) { 199 for (size_t i = 0; i < count; i++) {
193 int64_t id = va_arg(args, int64_t); 200 int64_t id = va_arg(args, int64_t);
194 list.push_back(id); 201 list.push_back(id);
195 } 202 }
196 SortDisplayIdList(&list); 203 SortDisplayIdList(&list);
197 return list; 204 return list;
198 } 205 }
199 206
200 } // namespace test 207 } // namespace test
201 } // namespace display 208 } // namespace display
OLDNEW
« no previous file with comments | « ui/display/test/display_manager_test_api.h ('k') | ui/keyboard/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698