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

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

Issue 8343023: rename Run in MessageLoopForUI to RunWithDispatcher (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 9 years, 2 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 | « views/controls/menu/menu_controller.cc ('k') | views/desktop/desktop_main.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) 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/nested_dispatcher_gtk.h" 5 #include "views/controls/menu/nested_dispatcher_gtk.h"
6 6
7 #if defined(TOUCH_UI) 7 #if defined(TOUCH_UI)
8 #include "views/focus/accelerator_handler.h" 8 #include "views/focus/accelerator_handler.h"
9 #endif 9 #endif
10 10
11 namespace views { 11 namespace views {
12 12
13 NestedDispatcherGtk::NestedDispatcherGtk(MessageLoopForUI::Dispatcher* creator, 13 NestedDispatcherGtk::NestedDispatcherGtk(MessageLoopForUI::Dispatcher* creator,
14 bool allow_nested_task) 14 bool allow_nested_task)
15 : creator_(creator), 15 : creator_(creator),
16 allow_nested_task_(allow_nested_task) { 16 allow_nested_task_(allow_nested_task) {
17 } 17 }
18 18
19 bool NestedDispatcherGtk::RunAndSelfDestruct() { 19 bool NestedDispatcherGtk::RunAndSelfDestruct() {
20 bool nestable = MessageLoopForUI::current()->NestableTasksAllowed(); 20 bool nestable = MessageLoopForUI::current()->NestableTasksAllowed();
21 if (allow_nested_task_) 21 if (allow_nested_task_)
22 MessageLoopForUI::current()->SetNestableTasksAllowed(true); 22 MessageLoopForUI::current()->SetNestableTasksAllowed(true);
23 MessageLoopForUI::current()->Run(this); 23 MessageLoopForUI::current()->RunWithDispatcher(this);
24 if (allow_nested_task_) 24 if (allow_nested_task_)
25 MessageLoopForUI::current()->SetNestableTasksAllowed(nestable); 25 MessageLoopForUI::current()->SetNestableTasksAllowed(nestable);
26 bool creator_is_deleted = creator_ == NULL; 26 bool creator_is_deleted = creator_ == NULL;
27 delete this; 27 delete this;
28 return creator_is_deleted; 28 return creator_is_deleted;
29 } 29 }
30 30
31 void NestedDispatcherGtk::CreatorDestroyed() { 31 void NestedDispatcherGtk::CreatorDestroyed() {
32 creator_ = NULL; 32 creator_ = NULL;
33 } 33 }
34 34
35 #if defined(TOUCH_UI) 35 #if defined(TOUCH_UI)
36 base::MessagePumpDispatcher::DispatchStatus 36 base::MessagePumpDispatcher::DispatchStatus
37 NestedDispatcherGtk::Dispatch(XEvent* xevent) { 37 NestedDispatcherGtk::Dispatch(XEvent* xevent) {
38 return creator_->Dispatch(xevent); 38 return creator_->Dispatch(xevent);
39 } 39 }
40 #else 40 #else
41 bool NestedDispatcherGtk::Dispatch(GdkEvent* event) { 41 bool NestedDispatcherGtk::Dispatch(GdkEvent* event) {
42 return creator_ && creator_->Dispatch(event); 42 return creator_ && creator_->Dispatch(event);
43 } 43 }
44 #endif // defined(TOUCH_UI) 44 #endif // defined(TOUCH_UI)
45 45
46 } // namespace views 46 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/menu/menu_controller.cc ('k') | views/desktop/desktop_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698