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

Unified Diff: ash/sysui/shelf_delegate_mus.cc

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/sysui/context_menu_mus.cc ('k') | ash/test/shelf_view_test_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/shelf_delegate_mus.cc
diff --git a/ash/sysui/shelf_delegate_mus.cc b/ash/sysui/shelf_delegate_mus.cc
index 8e6564ffe9f929e30674faa6b450a4b411b33c54..b24c0b1e712a100484783a1694cd47252009c998 100644
--- a/ash/sysui/shelf_delegate_mus.cc
+++ b/ash/sysui/shelf_delegate_mus.cc
@@ -6,13 +6,13 @@
#include <memory>
+#include "ash/common/shelf/shelf_types.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_item_delegate.h"
#include "ash/shelf/shelf_item_delegate_manager.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_menu_model.h"
#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_types.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "base/strings/string_util.h"
@@ -284,7 +284,7 @@ void ShelfDelegateMus::AddObserver(
}
void ShelfDelegateMus::SetAlignment(mash::shelf::mojom::Alignment alignment) {
- wm::ShelfAlignment value = static_cast<wm::ShelfAlignment>(alignment);
+ ShelfAlignment value = static_cast<ShelfAlignment>(alignment);
Shelf::ForPrimaryDisplay()->SetAlignment(value);
}
« no previous file with comments | « ash/sysui/context_menu_mus.cc ('k') | ash/test/shelf_view_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698