summaryrefslogtreecommitdiffstats
path: root/ui/views/controls/menu/menu_controller_unittest.cc
diff options
context:
space:
mode:
authorkpschoedel <kpschoedel@chromium.org>2015-04-14 07:36:26 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-14 14:36:37 +0000
commita824971547acc92c86a302e442c385f94d63a3fb (patch)
tree72134e5073207a0c9a997890ef88ff6fbe1b6fa6 /ui/views/controls/menu/menu_controller_unittest.cc
parent1f3cf686b7e5ffcbf867b3f3775ba83b79fbf504 (diff)
downloadchromium_src-a824971547acc92c86a302e442c385f94d63a3fb.zip
chromium_src-a824971547acc92c86a302e442c385f94d63a3fb.tar.gz
chromium_src-a824971547acc92c86a302e442c385f94d63a3fb.tar.bz2
Change device IDs from unsigned to signed.
Change ui::InputDevice::id and ash::DisplayInfo::touch_device_id_ from 'unsigned int' to 'int' in accordance with the coding style guide. Review URL: https://codereview.chromium.org/1071193002 Cr-Commit-Position: refs/heads/master@{#325042}
Diffstat (limited to 'ui/views/controls/menu/menu_controller_unittest.cc')
-rw-r--r--ui/views/controls/menu/menu_controller_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/views/controls/menu/menu_controller_unittest.cc b/ui/views/controls/menu/menu_controller_unittest.cc
index 99e889a..73461e0 100644
--- a/ui/views/controls/menu/menu_controller_unittest.cc
+++ b/ui/views/controls/menu/menu_controller_unittest.cc
@@ -296,7 +296,7 @@ TEST_F(MenuControllerTest, TouchIdsReleasedCorrectly) {
owner->GetNativeWindow()->GetRootWindow()->AddPreTargetHandler(
&test_event_handler);
- std::vector<unsigned int> devices;
+ std::vector<int> devices;
devices.push_back(1);
ui::SetUpTouchDevicesForTest(devices);