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

Unified Diff: ash/common/shelf/overflow_button.h

Issue 2164733002: mash: Convert ash shelf overflow bubble to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/overflow_bubble_view.cc ('k') | ash/common/shelf/overflow_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/overflow_button.h
diff --git a/ash/shelf/overflow_button.h b/ash/common/shelf/overflow_button.h
similarity index 86%
rename from ash/shelf/overflow_button.h
rename to ash/common/shelf/overflow_button.h
index a101b3e87df72dd92e0026151893cb54d58b567b..ac2a4faf2b65a1fa037eed75d7426d36c92500a6 100644
--- a/ash/shelf/overflow_button.h
+++ b/ash/common/shelf/overflow_button.h
@@ -2,23 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_OVERFLOW_BUTTON_H_
-#define ASH_SHELF_OVERFLOW_BUTTON_H_
+#ifndef ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_
+#define ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_
-#include "ash/common/shelf/shelf_types.h"
-#include "base/compiler_specific.h"
#include "base/macros.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/views/controls/button/custom_button.h"
namespace ash {
class InkDropButtonListener;
-class Shelf;
+class WmShelf;
// Shelf overflow chevron button.
class OverflowButton : public views::CustomButton {
public:
- OverflowButton(InkDropButtonListener* listener, Shelf* shelf);
+ OverflowButton(InkDropButtonListener* listener, WmShelf* wm_shelf);
~OverflowButton() override;
void OnShelfAlignmentChanged();
@@ -58,11 +56,11 @@ class OverflowButton : public views::CustomButton {
gfx::ImageSkia right_image_;
InkDropButtonListener* listener_;
- Shelf* shelf_;
+ WmShelf* wm_shelf_;
DISALLOW_COPY_AND_ASSIGN(OverflowButton);
};
} // namespace ash
-#endif // ASH_SHELF_OVERFLOW_BUTTON_H_
+#endif // ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_
« no previous file with comments | « ash/common/shelf/overflow_bubble_view.cc ('k') | ash/common/shelf/overflow_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698