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

Side by Side Diff: trunk/src/ui/views/controls/menu/menu_runner.h

Issue 416903002: Revert 285142 "Open the WrenchMenu on mouseover when dragging a ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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
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 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // DropMenuClosed method. 75 // DropMenuClosed method.
76 FOR_DROP = 1 << 2, 76 FOR_DROP = 1 << 2,
77 77
78 // The menu is a context menu (not necessarily nested), for example right 78 // The menu is a context menu (not necessarily nested), for example right
79 // click on a link on a website in the browser. 79 // click on a link on a website in the browser.
80 CONTEXT_MENU = 1 << 3, 80 CONTEXT_MENU = 1 << 3,
81 81
82 // The menu should behave like a Windows native Combobox dropdow menu. 82 // The menu should behave like a Windows native Combobox dropdow menu.
83 // This behavior includes accepting the pending item and closing on F4. 83 // This behavior includes accepting the pending item and closing on F4.
84 COMBOBOX = 1 << 4, 84 COMBOBOX = 1 << 4,
85
86 // A child view is performing a drag-and-drop operation, so the menu should
87 // stay open (even if it doesn't receive drag updated events). In this case,
88 // the caller is responsible for closing the menu upon completion of the
89 // drag-and-drop.
90 NESTED_DRAG = 1 << 5,
91 }; 85 };
92 86
93 enum RunResult { 87 enum RunResult {
94 // Indicates RunMenuAt is returning because the MenuRunner was deleted. 88 // Indicates RunMenuAt is returning because the MenuRunner was deleted.
95 MENU_DELETED, 89 MENU_DELETED,
96 90
97 // Indicates RunMenuAt returned and MenuRunner was not deleted. 91 // Indicates RunMenuAt returned and MenuRunner was not deleted.
98 NORMAL_EXIT 92 NORMAL_EXIT
99 }; 93 };
100 94
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 155
162 protected: 156 protected:
163 DisplayChangeListener() {} 157 DisplayChangeListener() {}
164 }; 158 };
165 159
166 } // namespace internal 160 } // namespace internal
167 161
168 } // namespace views 162 } // namespace views
169 163
170 #endif // UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_ 164 #endif // UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_
OLDNEW
« no previous file with comments | « trunk/src/ui/views/controls/menu/menu_controller.cc ('k') | trunk/src/ui/views/controls/menu/menu_runner_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698