Index: ash/virtual_keyboard_controller.cc |
diff --git a/ash/virtual_keyboard_controller.cc b/ash/virtual_keyboard_controller.cc |
index 5c54f46960871a350db5577309109df5a938f7cf..b88b0cfe7dd4c9c15d73ad29fb26fc8a9a085418 100644 |
--- a/ash/virtual_keyboard_controller.cc |
+++ b/ash/virtual_keyboard_controller.cc |
@@ -75,8 +75,8 @@ void VirtualKeyboardController::UpdateDevices() { |
std::vector<ui::KeyboardDevice> keyboards = |
device_data_manager->keyboard_devices(); |
for (auto iter = keyboards.begin(); |
- iter != keyboards.end() || |
- (has_internal_keyboard_ && has_external_keyboard_); |
+ iter != keyboards.end() && |
+ (!has_internal_keyboard_ || !has_external_keyboard_); |
++iter) { |
oshima
2014/11/05 01:34:37
how about
for (ui::KeyboardDevice* device : keybo
rsadam
2014/11/05 01:42:32
NInja complains if I make it a pointer, other than
|
ui::InputDeviceType type = (*iter).type; |
if (type == ui::InputDeviceType::INPUT_DEVICE_INTERNAL) |