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

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

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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/button/custom_button_unittest.cc ('k') | ui/views/corewm/base_focus_rules.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 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windowsx.h> 8 #include <windowsx.h>
9 #endif 9 #endif
10 10
(...skipping 25 matching lines...) Expand all
36 #include "ui/views/focus/view_storage.h" 36 #include "ui/views/focus/view_storage.h"
37 #include "ui/views/mouse_constants.h" 37 #include "ui/views/mouse_constants.h"
38 #include "ui/views/view_constants.h" 38 #include "ui/views/view_constants.h"
39 #include "ui/views/views_delegate.h" 39 #include "ui/views/views_delegate.h"
40 #include "ui/views/widget/root_view.h" 40 #include "ui/views/widget/root_view.h"
41 #include "ui/views/widget/tooltip_manager.h" 41 #include "ui/views/widget/tooltip_manager.h"
42 #include "ui/views/widget/widget.h" 42 #include "ui/views/widget/widget.h"
43 43
44 #if defined(USE_AURA) 44 #if defined(USE_AURA)
45 #include "ui/aura/env.h" 45 #include "ui/aura/env.h"
46 #include "ui/aura/root_window.h" 46 #include "ui/aura/window_event_dispatcher.h"
47 #endif 47 #endif
48 48
49 #if defined(OS_WIN) 49 #if defined(OS_WIN)
50 #include "ui/views/win/hwnd_message_handler.h" 50 #include "ui/views/win/hwnd_message_handler.h"
51 #include "ui/views/win/hwnd_util.h" 51 #include "ui/views/win/hwnd_util.h"
52 #endif 52 #endif
53 53
54 #if defined(USE_X11) 54 #if defined(USE_X11)
55 #include <X11/Xlib.h> 55 #include <X11/Xlib.h>
56 #endif 56 #endif
(...skipping 2282 matching lines...) Expand 10 before | Expand all | Expand 10 after
2339 (!pending_state_.item->HasSubmenu() || 2339 (!pending_state_.item->HasSubmenu() ||
2340 !pending_state_.item->GetSubmenu()->IsShowing())) { 2340 !pending_state_.item->GetSubmenu()->IsShowing())) {
2341 // On exit if the user hasn't selected an item with a submenu, move the 2341 // On exit if the user hasn't selected an item with a submenu, move the
2342 // selection back to the parent menu item. 2342 // selection back to the parent menu item.
2343 SetSelection(pending_state_.item->GetParentMenuItem(), 2343 SetSelection(pending_state_.item->GetParentMenuItem(),
2344 SELECTION_OPEN_SUBMENU); 2344 SELECTION_OPEN_SUBMENU);
2345 } 2345 }
2346 } 2346 }
2347 2347
2348 } // namespace views 2348 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/custom_button_unittest.cc ('k') | ui/views/corewm/base_focus_rules.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698