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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/shelf/shelf_bezel_event_filter.cc ('k') | ash/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_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 "ui/gfx/shadow_value.h" 9 #include "ui/gfx/shadow_value.h"
10 #include "ui/views/controls/button/custom_button.h" 10 #include "ui/views/controls/button/custom_button.h"
11 #include "ui/views/controls/image_view.h" 11 #include "ui/views/controls/image_view.h"
12 12
13 namespace ash { 13 namespace ash {
14 namespace internal {
15
16 class ShelfButtonHost; 14 class ShelfButtonHost;
17 class ShelfLayoutManager; 15 class ShelfLayoutManager;
18 16
19 // Button used for items on the launcher, except for the AppList. 17 // Button used for items on the launcher, except for the AppList.
20 class ASH_EXPORT ShelfButton : public views::CustomButton { 18 class ASH_EXPORT ShelfButton : public views::CustomButton {
21 public: 19 public:
22 // Used to indicate the current state of the button. 20 // Used to indicate the current state of the button.
23 enum State { 21 enum State {
24 // Nothing special. Usually represents an app shortcut item with no running 22 // Nothing special. Usually represents an app shortcut item with no running
25 // instance. 23 // instance.
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 145
148 gfx::ShadowValues icon_shadows_; 146 gfx::ShadowValues icon_shadows_;
149 147
150 // If non-null the destuctor sets this to true. This is set while the menu is 148 // If non-null the destuctor sets this to true. This is set while the menu is
151 // showing and used to detect if the menu was deleted while running. 149 // showing and used to detect if the menu was deleted while running.
152 bool* destroyed_flag_; 150 bool* destroyed_flag_;
153 151
154 DISALLOW_COPY_AND_ASSIGN(ShelfButton); 152 DISALLOW_COPY_AND_ASSIGN(ShelfButton);
155 }; 153 };
156 154
157 } // namespace internal
158 } // namespace ash 155 } // namespace ash
159 156
160 #endif // ASH_SHELF_SHELF_BUTTON_H_ 157 #endif // ASH_SHELF_SHELF_BUTTON_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_bezel_event_filter.cc ('k') | ash/shelf/shelf_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698