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

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

Issue 869433007: Revert of Don't refcount tracking id -> slot id mapping. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « ui/views/controls/menu/menu_controller_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_event_dispatcher_linux.h" 5 #include "ui/views/controls/menu/menu_event_dispatcher_linux.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/events/event_utils.h" 9 #include "ui/events/event_utils.h"
10 #include "ui/events/keycodes/keyboard_code_conversion.h" 10 #include "ui/events/keycodes/keyboard_code_conversion.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 } 68 }
69 } 69 }
70 should_quit = false; 70 should_quit = false;
71 should_perform_default = false; 71 should_perform_default = false;
72 break; 72 break;
73 } 73 }
74 case ui::ET_KEY_RELEASED: 74 case ui::ET_KEY_RELEASED:
75 should_quit = false; 75 should_quit = false;
76 should_perform_default = false; 76 should_perform_default = false;
77 break; 77 break;
78 case ui::ET_TOUCH_RELEASED:
79 case ui::ET_TOUCH_CANCELLED:
80 // Don't allow the event copy to clear the native touch id
81 // mapping, or we'll lose the mapping before the initial event
82 // has finished being dispatched.
83 static_cast<ui::TouchEvent*>(ui_event.get())
84 ->set_should_remove_native_touch_id_mapping(false);
85 break;
86 default: 78 default:
87 break; 79 break;
88 } 80 }
89 } 81 }
90 82
91 if (should_quit || menu_controller_->exit_type() != MenuController::EXIT_NONE) 83 if (should_quit || menu_controller_->exit_type() != MenuController::EXIT_NONE)
92 menu_controller_->TerminateNestedMessageLoop(); 84 menu_controller_->TerminateNestedMessageLoop();
93 85
94 return should_perform_default ? ui::POST_DISPATCH_PERFORM_DEFAULT 86 return should_perform_default ? ui::POST_DISPATCH_PERFORM_DEFAULT
95 : ui::POST_DISPATCH_NONE; 87 : ui::POST_DISPATCH_NONE;
96 } 88 }
97 89
98 } // namespace internal 90 } // namespace internal
99 } // namespace views 91 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698