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

Unified Diff: ash/sysui/shelf_delegate_mus.cc

Issue 1984433002: Hook up Chrome's wallpaper picker for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add explicit WallpaperLayout enum conversion functions. 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/shell_delegate_mus.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 40a69115b145e4fb9a00de49f3b7a1b32cecb7b2..4da3d09666abf49f034c0eccc7f7a24b0c513e56 100644
--- a/ash/sysui/shelf_delegate_mus.cc
+++ b/ash/sysui/shelf_delegate_mus.cc
@@ -352,12 +352,13 @@ void ShelfDelegateMus::SetItemImage(const mojo::String& app_id,
}
void ShelfDelegateMus::OnUserWindowObserverAdded(
- mojo::Array<mojom::UserWindowPtr> user_windows) {
+ mojo::Array<ash::mojom::UserWindowPtr> user_windows) {
for (size_t i = 0; i < user_windows.size(); ++i)
OnUserWindowAdded(std::move(user_windows[i]));
}
-void ShelfDelegateMus::OnUserWindowAdded(mojom::UserWindowPtr user_window) {
+void ShelfDelegateMus::OnUserWindowAdded(
+ ash::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/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698