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

Side by Side Diff: ui/views/controls/menu/menu_runner_impl_cocoa.h

Issue 1876013002: Fixed potential crash on destroying MenuRunnerImplCocoa. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
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 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_COCOA_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_COCOA_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_COCOA_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_COCOA_H_
7 7
8 #include "ui/views/controls/menu/menu_runner_impl_interface.h" 8 #include "ui/views/controls/menu/menu_runner_impl_interface.h"
9 9
10 #include <stdint.h> 10 #include <stdint.h>
(...skipping 23 matching lines...) Expand all
34 base::TimeDelta GetClosingEventTime() const override; 34 base::TimeDelta GetClosingEventTime() const override;
35 35
36 private: 36 private:
37 ~MenuRunnerImplCocoa() override; 37 ~MenuRunnerImplCocoa() override;
38 38
39 // The Cocoa menu controller that this instance is bridging. 39 // The Cocoa menu controller that this instance is bridging.
40 base::scoped_nsobject<MenuController> menu_controller_; 40 base::scoped_nsobject<MenuController> menu_controller_;
41 41
42 // Set if |running_| and Release() has been invoked. 42 // Set if |running_| and Release() has been invoked.
43 bool delete_after_run_; 43 bool delete_after_run_;
44 bool in_menu_runloop_;
tapted 2016/04/12 06:22:58 Let's call this running_ -- the comment above even
44 45
45 // The timestamp of the event which closed the menu - or 0. 46 // The timestamp of the event which closed the menu - or 0.
46 base::TimeDelta closing_event_time_; 47 base::TimeDelta closing_event_time_;
47 48
48 DISALLOW_COPY_AND_ASSIGN(MenuRunnerImplCocoa); 49 DISALLOW_COPY_AND_ASSIGN(MenuRunnerImplCocoa);
49 }; 50 };
50 51
51 } // namespace internal 52 } // namespace internal
52 } // namespace views 53 } // namespace views
53 54
54 #endif // UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_COCOA_H_ 55 #endif // UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698