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

Unified Diff: ash/public/cpp/mus_property_mirror_ash.cc

Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)
Patch Set: Fix struct traits typo. Created 3 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/public/cpp/app_launch_id.cc ('k') | ash/public/cpp/shelf_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/public/cpp/mus_property_mirror_ash.cc
diff --git a/ash/public/cpp/mus_property_mirror_ash.cc b/ash/public/cpp/mus_property_mirror_ash.cc
index 770c4a1ff6fc1540ccba1a2f4392daee835939df..a9b634eeffbf3aa47c7eb46dbabc97adf9d840e9 100644
--- a/ash/public/cpp/mus_property_mirror_ash.cc
+++ b/ash/public/cpp/mus_property_mirror_ash.cc
@@ -42,8 +42,8 @@ void MusPropertyMirrorAsh::MirrorPropertyFromWidgetWindowToRootWindow(
root_window->SetProperty(kWindowPinTypeKey, value);
} else if (key == aura::client::kAppIconKey) {
MirrorOwnedProperty(window, root_window, aura::client::kAppIconKey);
- } else if (key == aura::client::kAppIdKey) {
- MirrorOwnedProperty(window, root_window, aura::client::kAppIdKey);
+ } else if (key == kShelfIDKey) {
+ MirrorOwnedProperty(window, root_window, kShelfIDKey);
} else if (key == aura::client::kDrawAttentionKey) {
bool value = window->GetProperty(aura::client::kDrawAttentionKey);
root_window->SetProperty(aura::client::kDrawAttentionKey, value);
« no previous file with comments | « ash/public/cpp/app_launch_id.cc ('k') | ash/public/cpp/shelf_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698