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

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

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 (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_CONTROLLER_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include <stddef.h>
11
10 #include <list> 12 #include <list>
11 #include <set> 13 #include <set>
12 #include <vector> 14 #include <vector>
13 15
14 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
17 #include "base/macros.h"
15 #include "base/memory/linked_ptr.h" 18 #include "base/memory/linked_ptr.h"
16 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
17 #include "base/timer/timer.h" 20 #include "base/timer/timer.h"
18 #include "ui/events/event.h" 21 #include "ui/events/event.h"
19 #include "ui/events/event_constants.h" 22 #include "ui/events/event_constants.h"
20 #include "ui/events/platform/platform_event_dispatcher.h" 23 #include "ui/events/platform/platform_event_dispatcher.h"
21 #include "ui/views/controls/button/menu_button.h" 24 #include "ui/views/controls/button/menu_button.h"
22 #include "ui/views/controls/menu/menu_config.h" 25 #include "ui/views/controls/menu/menu_config.h"
23 #include "ui/views/controls/menu/menu_delegate.h" 26 #include "ui/views/controls/menu/menu_delegate.h"
24 #include "ui/views/widget/widget_observer.h" 27 #include "ui/views/widget/widget_observer.h"
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 int current_mouse_pressed_state_; 688 int current_mouse_pressed_state_;
686 689
687 scoped_ptr<MenuMessageLoop> message_loop_; 690 scoped_ptr<MenuMessageLoop> message_loop_;
688 691
689 DISALLOW_COPY_AND_ASSIGN(MenuController); 692 DISALLOW_COPY_AND_ASSIGN(MenuController);
690 }; 693 };
691 694
692 } // namespace views 695 } // namespace views
693 696
694 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 697 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698