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

Unified Diff: mash/wm/shelf_layout_manager.cc

Issue 2024313002: Moves mash/wm/public -> ash/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 7 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 | « mash/wm/shelf_layout_impl.h ('k') | mash/wm/status_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/shelf_layout_manager.cc
diff --git a/mash/wm/shelf_layout_manager.cc b/mash/wm/shelf_layout_manager.cc
index 01a990af8e9b03d764dc46115ec46e63f1071e06..50805e47995bc056ce1d07748d05d012df5c00a2 100644
--- a/mash/wm/shelf_layout_manager.cc
+++ b/mash/wm/shelf_layout_manager.cc
@@ -4,9 +4,9 @@
#include "mash/wm/shelf_layout_manager.h"
+#include "ash/public/interfaces/ash_window_type.mojom.h"
#include "components/mus/public/cpp/window.h"
#include "mash/wm/property_util.h"
-#include "mash/wm/public/interfaces/ash_window_type.mojom.h"
#include "mash/wm/shelf_layout_manager_delegate.h"
#include "ui/gfx/geometry/rect.h"
@@ -26,7 +26,7 @@ ShelfLayoutManager::~ShelfLayoutManager() {}
mus::Window* ShelfLayoutManager::GetShelfWindow() {
for (mus::Window* child : owner()->children()) {
- if (GetAshWindowType(child) == mojom::AshWindowType::SHELF)
+ if (GetAshWindowType(child) == ash::mojom::AshWindowType::SHELF)
return child;
}
return nullptr;
@@ -55,7 +55,7 @@ void ShelfLayoutManager::SetAutoHideBehavior(
// shelf restarts.
void ShelfLayoutManager::LayoutWindow(mus::Window* window) {
- if (GetAshWindowType(window) != mojom::AshWindowType::SHELF) {
+ if (GetAshWindowType(window) != ash::mojom::AshWindowType::SHELF) {
// Phantom windows end up in this container, ignore them.
return;
}
@@ -75,7 +75,7 @@ void ShelfLayoutManager::LayoutWindow(mus::Window* window) {
}
void ShelfLayoutManager::WindowAdded(mus::Window* window) {
- if (GetAshWindowType(window) == mojom::AshWindowType::SHELF)
+ if (GetAshWindowType(window) == ash::mojom::AshWindowType::SHELF)
delegate_->OnShelfWindowAvailable();
}
« no previous file with comments | « mash/wm/shelf_layout_impl.h ('k') | mash/wm/status_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698