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

Unified Diff: ash/common/system/status_area_widget_delegate.h

Issue 2109193002: mash: Convert StatusAreaWidgetDelegate to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/wm_shelf.h ('k') | ash/common/system/status_area_widget_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/status_area_widget_delegate.h
diff --git a/ash/system/status_area_widget_delegate.h b/ash/common/system/status_area_widget_delegate.h
similarity index 88%
rename from ash/system/status_area_widget_delegate.h
rename to ash/common/system/status_area_widget_delegate.h
index 38c284459b6aa41800d674408dd59f62ecfdd644..915bff9017d27677aafc2ac72b666216e9ad6782 100644
--- a/ash/system/status_area_widget_delegate.h
+++ b/ash/common/system/status_area_widget_delegate.h
@@ -2,12 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
-#define ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
+#ifndef ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
+#define ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
#include "ash/ash_export.h"
#include "ash/common/shelf/shelf_types.h"
-#include "ash/wm/gestures/shelf_gesture_handler.h"
#include "base/macros.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/views/accessible_pane_view.h"
@@ -16,6 +15,7 @@
namespace ash {
class FocusCycler;
+// The View for the status area widget.
class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView,
public views::WidgetDelegate {
public:
@@ -61,13 +61,13 @@ class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView,
void SetBorderOnChild(views::View* child, bool extend_border_to_edge);
const FocusCycler* focus_cycler_for_testing_;
- ShelfAlignment alignment_;
- ShelfGestureHandler gesture_handler_;
+ // TODO(jamescook): Get this from WmShelf.
+ ShelfAlignment alignment_;
DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate);
};
} // namespace ash
-#endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
+#endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
« no previous file with comments | « ash/common/shelf/wm_shelf.h ('k') | ash/common/system/status_area_widget_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698