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

Side by Side Diff: views/controls/menu/menu_host.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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 | « views/controls/menu/menu_host.h ('k') | views/controls/menu/menu_host_root_view.h » ('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) 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_host.h" 5 #include "views/controls/menu/menu_host.h"
6 6
7 #include "ui/views/widget/native_widget_private.h"
8 #include "ui/views/widget/widget.h"
7 #include "views/controls/menu/menu_controller.h" 9 #include "views/controls/menu/menu_controller.h"
8 #include "views/controls/menu/menu_host_root_view.h" 10 #include "views/controls/menu/menu_host_root_view.h"
9 #include "views/controls/menu/menu_item_view.h" 11 #include "views/controls/menu/menu_item_view.h"
10 #include "views/controls/menu/native_menu_host.h" 12 #include "views/controls/menu/native_menu_host.h"
11 #include "views/controls/menu/submenu_view.h" 13 #include "views/controls/menu/submenu_view.h"
12 #include "views/widget/native_widget_private.h"
13 #include "views/widget/widget.h"
14 14
15 namespace views { 15 namespace views {
16 16
17 //////////////////////////////////////////////////////////////////////////////// 17 ////////////////////////////////////////////////////////////////////////////////
18 // MenuHost, public: 18 // MenuHost, public:
19 19
20 MenuHost::MenuHost(SubmenuView* submenu) 20 MenuHost::MenuHost(SubmenuView* submenu)
21 : submenu_(submenu), 21 : submenu_(submenu),
22 destroying_(false), 22 destroying_(false),
23 ignore_capture_lost_(false) { 23 ignore_capture_lost_(false) {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 if (!destroying_) { 104 if (!destroying_) {
105 // We weren't explicitly told to destroy ourselves, which means the menu was 105 // We weren't explicitly told to destroy ourselves, which means the menu was
106 // deleted out from under us (the window we're parented to was closed). Tell 106 // deleted out from under us (the window we're parented to was closed). Tell
107 // the SubmenuView to drop references to us. 107 // the SubmenuView to drop references to us.
108 submenu_->MenuHostDestroyed(); 108 submenu_->MenuHostDestroyed();
109 } 109 }
110 Widget::OnNativeWidgetDestroyed(); 110 Widget::OnNativeWidgetDestroyed();
111 } 111 }
112 112
113 } // namespace views 113 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/menu/menu_host.h ('k') | views/controls/menu/menu_host_root_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698