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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mash/wm/window_manager.cc

Issue 1824183002: Mash: Show app icons in shelf based on the Widget's app icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: //ui/resources Created 4 years, 9 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
« mash/wm/user_window_controller_impl.cc ('K') | « mash/wm/user_window_controller_impl.cc ('k') | ui/views/mus/native_widget_mus.cc » ('j') | ui/views/mus/native_widget_mus.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager.cc
diff --git a/mash/wm/window_manager.cc b/mash/wm/window_manager.cc
index 5905469f76b869c80c77530be67e41bd82fcfef8..24ed9d0a42c094351beab77e5d0fb4db5abdf64d 100644
--- a/mash/wm/window_manager.cc
+++ b/mash/wm/window_manager.cc
@@ -153,7 +153,8 @@ bool WindowManager::OnWmSetProperty(
return name == mus::mojom::WindowManager::kShowState_Property ||
name == mus::mojom::WindowManager::kPreferredSize_Property ||
name == mus::mojom::WindowManager::kResizeBehavior_Property ||
- name == mus::mojom::WindowManager::kWindowTitle_Property;
+ name == mus::mojom::WindowManager::kWindowTitle_Property ||
+ name == mus::mojom::WindowManager::kWindowAppIcon_Property;
msw 2016/03/24 17:40:54 nit: also abc order
James Cook 2016/03/25 15:39:28 Done.
}
mus::Window* WindowManager::OnWmCreateTopLevelWindow(
« mash/wm/user_window_controller_impl.cc ('K') | « mash/wm/user_window_controller_impl.cc ('k') | ui/views/mus/native_widget_mus.cc » ('j') | ui/views/mus/native_widget_mus.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698