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

Unified Diff: ash/sysui/shelf_delegate_mus.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 | « ash/sysui/shelf_delegate_mus.h ('k') | ash/sysui/sysui_application.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 d41b36f9fb3d3bdba517558c96cf232be4d72b77..6e9928bd70752c4d1a93e759549b7a43f0c34099 100644
--- a/ash/sysui/shelf_delegate_mus.cc
+++ b/ash/sysui/shelf_delegate_mus.cc
@@ -28,7 +28,7 @@
#include "ui/resources/grit/ui_resources.h"
#include "ui/views/mus/window_manager_connection.h"
-using mash::wm::mojom::UserWindowController;
+using ash::mojom::UserWindowController;
namespace ash {
namespace sysui {
@@ -354,13 +354,12 @@ void ShelfDelegateMus::SetItemImage(const mojo::String& app_id,
}
void ShelfDelegateMus::OnUserWindowObserverAdded(
- mojo::Array<mash::wm::mojom::UserWindowPtr> user_windows) {
+ mojo::Array<mojom::UserWindowPtr> user_windows) {
for (size_t i = 0; i < user_windows.size(); ++i)
OnUserWindowAdded(std::move(user_windows[i]));
}
-void ShelfDelegateMus::OnUserWindowAdded(
- mash::wm::mojom::UserWindowPtr user_window) {
+void ShelfDelegateMus::OnUserWindowAdded(mojom::UserWindowPtr user_window) {
DCHECK(!window_id_to_shelf_id_.count(user_window->window_id));
if (user_window->ignored_by_shelf)
« no previous file with comments | « ash/sysui/shelf_delegate_mus.h ('k') | ash/sysui/sysui_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698