| 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/views/controls/combobox/native_combobox_views.h" | 5 #include "ui/views/controls/combobox/native_combobox_views.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "grit/ui_resources.h" | 9 #include "grit/ui_resources.h" |
| 10 #include "ui/base/keycodes/keyboard_codes.h" | 10 #include "ui/base/keycodes/keyboard_codes.h" |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 | 214 |
| 215 void NativeComboboxViews::SetFocus() { | 215 void NativeComboboxViews::SetFocus() { |
| 216 text_border_->set_has_focus(true); | 216 text_border_->set_has_focus(true); |
| 217 } | 217 } |
| 218 | 218 |
| 219 bool NativeComboboxViews::HandleKeyPressed(const KeyEvent& e) { | 219 bool NativeComboboxViews::HandleKeyPressed(const KeyEvent& e) { |
| 220 return OnKeyPressed(e); | 220 return OnKeyPressed(e); |
| 221 } | 221 } |
| 222 | 222 |
| 223 bool NativeComboboxViews::HandleKeyReleased(const KeyEvent& e) { | 223 bool NativeComboboxViews::HandleKeyReleased(const KeyEvent& e) { |
| 224 return true; | 224 return false; // crbug.com/127520 |
| 225 } | 225 } |
| 226 | 226 |
| 227 void NativeComboboxViews::HandleFocus() { | 227 void NativeComboboxViews::HandleFocus() { |
| 228 SchedulePaint(); | 228 SchedulePaint(); |
| 229 } | 229 } |
| 230 | 230 |
| 231 void NativeComboboxViews::HandleBlur() { | 231 void NativeComboboxViews::HandleBlur() { |
| 232 } | 232 } |
| 233 | 233 |
| 234 gfx::NativeView NativeComboboxViews::GetTestingHandle() const { | 234 gfx::NativeView NativeComboboxViews::GetTestingHandle() const { |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 | 347 |
| 348 #if defined(USE_AURA) | 348 #if defined(USE_AURA) |
| 349 // static | 349 // static |
| 350 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( | 350 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( |
| 351 Combobox* combobox) { | 351 Combobox* combobox) { |
| 352 return new NativeComboboxViews(combobox); | 352 return new NativeComboboxViews(combobox); |
| 353 } | 353 } |
| 354 #endif | 354 #endif |
| 355 | 355 |
| 356 } // namespace views | 356 } // namespace views |
| OLD | NEW |