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

Unified Diff: ash/mus/window_manager.cc

Issue 2381183002: mash: Fix shelf window property use in Chrome. (Closed)
Patch Set: Sync and rebase; add comments. Created 4 years, 3 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
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 87530fa822eda4f699fe8e5dad558d113eb2ac6c..725beff5f1e7a9e088fddbb151e77dc19f06faba 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -300,6 +300,8 @@ bool WindowManager::OnWmSetProperty(
return name == ui::mojom::WindowManager::kShowState_Property ||
name == ui::mojom::WindowManager::kPreferredSize_Property ||
name == ui::mojom::WindowManager::kResizeBehavior_Property ||
+ name == ui::mojom::WindowManager::kShelfIconResourceId_Property ||
+ name == ui::mojom::WindowManager::kShelfItemType_Property ||
James Cook 2016/10/01 00:16:20 Does this need ShelfID?
msw 2016/10/03 19:14:22 Not yet; it will if Chrome needs to actually set w
name == ui::mojom::WindowManager::kWindowAppIcon_Property ||
name == ui::mojom::WindowManager::kWindowTitle_Property;
}

Powered by Google App Engine
This is Rietveld 408576698