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

Side by Side Diff: ash/common/shelf/shelf_button.h

Issue 2712293002: Remove non-MD code from ShelfButton (Closed)
Patch Set: Rebased Created 3 years, 9 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 | « no previous file | ash/common/shelf/shelf_button.cc » ('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_COMMON_SHELF_SHELF_BUTTON_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_BUTTON_H_
6 #define ASH_COMMON_SHELF_SHELF_BUTTON_H_ 6 #define ASH_COMMON_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 "base/macros.h"
10 #include "ui/gfx/shadow_value.h" 10 #include "ui/gfx/shadow_value.h"
11 #include "ui/views/controls/button/custom_button.h" 11 #include "ui/views/controls/button/custom_button.h"
12 #include "ui/views/controls/image_view.h" 12
13 namespace views {
14 class ImageView;
15 }
13 16
14 namespace ash { 17 namespace ash {
15 class InkDropButtonListener; 18 class InkDropButtonListener;
16 class ShelfView; 19 class ShelfView;
17 20
18 // Button used for items on the launcher, except for the AppList. 21 // Button used for items on the launcher, except for the AppList.
19 class ASH_EXPORT ShelfButton : public views::CustomButton { 22 class ASH_EXPORT ShelfButton : public views::CustomButton {
20 public: 23 public:
21 static const char kViewClassName[]; 24 static const char kViewClassName[];
22 25
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // If non-null the destuctor sets this to true. This is set while the menu is 122 // If non-null the destuctor sets this to true. This is set while the menu is
120 // showing and used to detect if the menu was deleted while running. 123 // showing and used to detect if the menu was deleted while running.
121 bool* destroyed_flag_; 124 bool* destroyed_flag_;
122 125
123 DISALLOW_COPY_AND_ASSIGN(ShelfButton); 126 DISALLOW_COPY_AND_ASSIGN(ShelfButton);
124 }; 127 };
125 128
126 } // namespace ash 129 } // namespace ash
127 130
128 #endif // ASH_COMMON_SHELF_SHELF_BUTTON_H_ 131 #endif // ASH_COMMON_SHELF_SHELF_BUTTON_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/shelf/shelf_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698