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

Side by Side Diff: ash/shelf/shelf_button.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/shelf/shelf_bezel_event_filter.h ('k') | ash/shelf/shelf_item_delegate_manager.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SHELF_SHELF_BUTTON_H_ 5 #ifndef ASH_SHELF_SHELF_BUTTON_H_
6 #define ASH_SHELF_SHELF_BUTTON_H_ 6 #define ASH_SHELF_SHELF_BUTTON_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/macros.h"
9 #include "ui/gfx/shadow_value.h" 10 #include "ui/gfx/shadow_value.h"
10 #include "ui/views/controls/button/custom_button.h" 11 #include "ui/views/controls/button/custom_button.h"
11 #include "ui/views/controls/image_view.h" 12 #include "ui/views/controls/image_view.h"
12 13
13 namespace ash { 14 namespace ash {
14 class ShelfButtonHost; 15 class ShelfButtonHost;
15 class ShelfLayoutManager; 16 class ShelfLayoutManager;
16 17
17 // Button used for items on the launcher, except for the AppList. 18 // Button used for items on the launcher, except for the AppList.
18 class ASH_EXPORT ShelfButton : public views::CustomButton { 19 class ASH_EXPORT ShelfButton : public views::CustomButton {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 // If non-null the destuctor sets this to true. This is set while the menu is 149 // If non-null the destuctor sets this to true. This is set while the menu is
149 // showing and used to detect if the menu was deleted while running. 150 // showing and used to detect if the menu was deleted while running.
150 bool* destroyed_flag_; 151 bool* destroyed_flag_;
151 152
152 DISALLOW_COPY_AND_ASSIGN(ShelfButton); 153 DISALLOW_COPY_AND_ASSIGN(ShelfButton);
153 }; 154 };
154 155
155 } // namespace ash 156 } // namespace ash
156 157
157 #endif // ASH_SHELF_SHELF_BUTTON_H_ 158 #endif // ASH_SHELF_SHELF_BUTTON_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_bezel_event_filter.h ('k') | ash/shelf/shelf_item_delegate_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698