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

Side by Side Diff: ash/shell/context_menu.h

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize 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
« no previous file with comments | « ash/shell/content/shell_content_state_impl.h ('k') | ash/shell/panel_window.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) 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 ASH_SHELL_CONTEXT_MENU_H_ 5 #ifndef ASH_SHELL_CONTEXT_MENU_H_
6 #define ASH_SHELL_CONTEXT_MENU_H_ 6 #define ASH_SHELL_CONTEXT_MENU_H_
7 7
8 #include "ash/shelf/shelf_alignment_menu.h" 8 #include "ash/shelf/shelf_alignment_menu.h"
9 #include "ash/shelf/shelf_types.h" 9 #include "ash/shelf/shelf_types.h"
10 #include "base/basictypes.h" 10 #include "base/macros.h"
11 #include "ui/base/models/simple_menu_model.h" 11 #include "ui/base/models/simple_menu_model.h"
12 12
13 namespace aura { 13 namespace aura {
14 class RootWindow; 14 class RootWindow;
15 } 15 }
16 16
17 namespace ash { 17 namespace ash {
18 namespace shell { 18 namespace shell {
19 19
20 // Context menu for the ash_shell. 20 // Context menu for the ash_shell.
(...skipping 20 matching lines...) Expand all
41 41
42 ShelfAlignmentMenu alignment_menu_; 42 ShelfAlignmentMenu alignment_menu_;
43 43
44 DISALLOW_COPY_AND_ASSIGN(ContextMenu); 44 DISALLOW_COPY_AND_ASSIGN(ContextMenu);
45 }; 45 };
46 46
47 } // namespace shell 47 } // namespace shell
48 } // namespace ash 48 } // namespace ash
49 49
50 #endif // ASH_SHELL_CONTEXT_MENU_H_ 50 #endif // ASH_SHELL_CONTEXT_MENU_H_
OLDNEW
« no previous file with comments | « ash/shell/content/shell_content_state_impl.h ('k') | ash/shell/panel_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698