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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/public/cpp/mus_property_mirror_ash.h" 5 #include "ash/public/cpp/mus_property_mirror_ash.h"
6 6
7 #include "ash/public/cpp/window_properties.h" 7 #include "ash/public/cpp/window_properties.h"
8 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
9 9
10 namespace { 10 namespace {
(...skipping 24 matching lines...) Expand all
35 bool value = window->GetProperty(kPanelAttachedKey); 35 bool value = window->GetProperty(kPanelAttachedKey);
36 root_window->SetProperty(kPanelAttachedKey, value); 36 root_window->SetProperty(kPanelAttachedKey, value);
37 } else if (key == kShelfItemTypeKey) { 37 } else if (key == kShelfItemTypeKey) {
38 int32_t value = window->GetProperty(kShelfItemTypeKey); 38 int32_t value = window->GetProperty(kShelfItemTypeKey);
39 root_window->SetProperty(kShelfItemTypeKey, value); 39 root_window->SetProperty(kShelfItemTypeKey, value);
40 } else if (key == kWindowPinTypeKey) { 40 } else if (key == kWindowPinTypeKey) {
41 ash::mojom::WindowPinType value = window->GetProperty(kWindowPinTypeKey); 41 ash::mojom::WindowPinType value = window->GetProperty(kWindowPinTypeKey);
42 root_window->SetProperty(kWindowPinTypeKey, value); 42 root_window->SetProperty(kWindowPinTypeKey, value);
43 } else if (key == aura::client::kAppIconKey) { 43 } else if (key == aura::client::kAppIconKey) {
44 MirrorOwnedProperty(window, root_window, aura::client::kAppIconKey); 44 MirrorOwnedProperty(window, root_window, aura::client::kAppIconKey);
45 } else if (key == aura::client::kAppIdKey) { 45 } else if (key == kShelfIDKey) {
46 MirrorOwnedProperty(window, root_window, aura::client::kAppIdKey); 46 MirrorOwnedProperty(window, root_window, kShelfIDKey);
47 } else if (key == aura::client::kDrawAttentionKey) { 47 } else if (key == aura::client::kDrawAttentionKey) {
48 bool value = window->GetProperty(aura::client::kDrawAttentionKey); 48 bool value = window->GetProperty(aura::client::kDrawAttentionKey);
49 root_window->SetProperty(aura::client::kDrawAttentionKey, value); 49 root_window->SetProperty(aura::client::kDrawAttentionKey, value);
50 } else if (key == aura::client::kTitleKey) { 50 } else if (key == aura::client::kTitleKey) {
51 MirrorOwnedProperty(window, root_window, aura::client::kTitleKey); 51 MirrorOwnedProperty(window, root_window, aura::client::kTitleKey);
52 } else if (key == aura::client::kWindowIconKey) { 52 } else if (key == aura::client::kWindowIconKey) {
53 MirrorOwnedProperty(window, root_window, aura::client::kWindowIconKey); 53 MirrorOwnedProperty(window, root_window, aura::client::kWindowIconKey);
54 } 54 }
55 } 55 }
56 56
57 } // namespace ash 57 } // namespace ash
OLDNEW
« 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