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

Unified Diff: ash/system/status_area_widget.h

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again 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/system/overview/overview_button_tray_unittest.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/status_area_widget.h
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h
index b6887447933e21779127fa42d8679f50b5aa89b6..efe536ff274419acb8b800b8d9210c7758f2d4e5 100644
--- a/ash/system/status_area_widget.h
+++ b/ash/system/status_area_widget.h
@@ -6,7 +6,7 @@
#define ASH_SYSTEM_STATUS_AREA_WIDGET_H_
#include "ash/ash_export.h"
-#include "ash/shelf/shelf_types.h"
+#include "ash/common/shelf/shelf_types.h"
#include "ash/system/user/login_status.h"
#include "base/macros.h"
#include "ui/views/widget/widget.h"
@@ -37,7 +37,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
void Shutdown();
// Update the alignment of the widget and tray views.
- void SetShelfAlignment(wm::ShelfAlignment alignment);
+ void SetShelfAlignment(ShelfAlignment alignment);
// Set the visibility of system notifications.
void SetHideSystemNotifications(bool hide);
« no previous file with comments | « ash/system/overview/overview_button_tray_unittest.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698