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

Side by Side Diff: ui/views/controls/menu/menu_controller.cc

Issue 10917075: events: Move some files into ui/base/events/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/menu/menu_controller.h ('k') | ui/views/controls/menu/submenu_view.cc » ('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/views/controls/menu/menu_controller.h" 5 #include "ui/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/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/time.h" 10 #include "base/time.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "ui/base/dragdrop/drag_utils.h" 12 #include "ui/base/dragdrop/drag_utils.h"
13 #include "ui/base/dragdrop/os_exchange_data.h" 13 #include "ui/base/dragdrop/os_exchange_data.h"
14 #include "ui/base/events.h" 14 #include "ui/base/events/event_constants.h"
15 #include "ui/base/keycodes/keyboard_codes.h" 15 #include "ui/base/keycodes/keyboard_codes.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/gfx/canvas.h" 17 #include "ui/gfx/canvas.h"
18 #include "ui/gfx/screen.h" 18 #include "ui/gfx/screen.h"
19 #include "ui/views/controls/button/menu_button.h" 19 #include "ui/views/controls/button/menu_button.h"
20 #include "ui/views/controls/menu/menu_config.h" 20 #include "ui/views/controls/menu/menu_config.h"
21 #include "ui/views/controls/menu/menu_controller_delegate.h" 21 #include "ui/views/controls/menu/menu_controller_delegate.h"
22 #include "ui/views/controls/menu/menu_scroll_view_container.h" 22 #include "ui/views/controls/menu/menu_scroll_view_container.h"
23 #include "ui/views/controls/menu/submenu_view.h" 23 #include "ui/views/controls/menu/submenu_view.h"
24 #include "ui/views/drag_utils.h" 24 #include "ui/views/drag_utils.h"
(...skipping 2094 matching lines...) Expand 10 before | Expand all | Expand 10 after
2119 2119
2120 #if defined(USE_AURA) 2120 #if defined(USE_AURA)
2121 void MenuController::OnWindowActivated(aura::Window* active, 2121 void MenuController::OnWindowActivated(aura::Window* active,
2122 aura::Window* old_active) { 2122 aura::Window* old_active) {
2123 if (!drag_in_progress_) 2123 if (!drag_in_progress_)
2124 Cancel(EXIT_ALL); 2124 Cancel(EXIT_ALL);
2125 } 2125 }
2126 #endif 2126 #endif
2127 2127
2128 } // namespace views 2128 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_controller.h ('k') | ui/views/controls/menu/submenu_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698