| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "views/controls/menu/menu_controller.h" | 5 #include "views/controls/menu/menu_controller.h" |
| 6 | 6 |
| 7 #include "base/i18n/case_conversion.h" | 7 #include "base/i18n/case_conversion.h" |
| 8 #include "base/i18n/rtl.h" | 8 #include "base/i18n/rtl.h" |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 #if defined(USE_AURA) && !defined(OS_WIN) | 27 #if defined(USE_AURA) && !defined(OS_WIN) |
| 28 #include "ui/aura/desktop.h" | 28 #include "ui/aura/desktop.h" |
| 29 #endif | 29 #endif |
| 30 | 30 |
| 31 #if defined(OS_LINUX) | 31 #if defined(OS_LINUX) |
| 32 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" | 32 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 #if defined(TOUCH_UI) | 35 #if defined(TOUCH_UI) |
| 36 #include "views/focus/accelerator_handler.h" | 36 #include "ui/views/focus/accelerator_handler.h" |
| 37 #endif | 37 #endif |
| 38 | 38 |
| 39 using base::Time; | 39 using base::Time; |
| 40 using base::TimeDelta; | 40 using base::TimeDelta; |
| 41 using ui::OSExchangeData; | 41 using ui::OSExchangeData; |
| 42 | 42 |
| 43 // Period of the scroll timer (in milliseconds). | 43 // Period of the scroll timer (in milliseconds). |
| 44 static const int kScrollTimerMS = 30; | 44 static const int kScrollTimerMS = 30; |
| 45 | 45 |
| 46 // Delay, in ms, between when menus are selected are moused over and the menu | 46 // Delay, in ms, between when menus are selected are moused over and the menu |
| (...skipping 1908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1955 return; | 1955 return; |
| 1956 | 1956 |
| 1957 // Reset the active_mouse_view_ before sending mouse capture lost. That way if | 1957 // Reset the active_mouse_view_ before sending mouse capture lost. That way if |
| 1958 // it calls back to us, we aren't in a weird state. | 1958 // it calls back to us, we aren't in a weird state. |
| 1959 View* active_view = active_mouse_view_; | 1959 View* active_view = active_mouse_view_; |
| 1960 active_mouse_view_ = NULL; | 1960 active_mouse_view_ = NULL; |
| 1961 active_view->OnMouseCaptureLost(); | 1961 active_view->OnMouseCaptureLost(); |
| 1962 } | 1962 } |
| 1963 | 1963 |
| 1964 } // namespace views | 1964 } // namespace views |
| OLD | NEW |