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

Side by Side Diff: ash/mus/window_manager.cc

Issue 2878133002: mash: Serialize ShelfIDs for property conversion and transport. (Closed)
Patch Set: Address comments. 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 | « no previous file | ash/mus_property_mirror_ash_unittest.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/mus/window_manager.h" 5 #include "ash/mus/window_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 wm_state_(base::MakeUnique<::wm::WMState>()), 83 wm_state_(base::MakeUnique<::wm::WMState>()),
84 property_converter_(base::MakeUnique<aura::PropertyConverter>()) { 84 property_converter_(base::MakeUnique<aura::PropertyConverter>()) {
85 property_converter_->RegisterProperty( 85 property_converter_->RegisterProperty(
86 kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property, 86 kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property,
87 aura::PropertyConverter::CreateAcceptAnyValueCallback()); 87 aura::PropertyConverter::CreateAcceptAnyValueCallback());
88 property_converter_->RegisterProperty( 88 property_converter_->RegisterProperty(
89 kRenderTitleAreaProperty, 89 kRenderTitleAreaProperty,
90 ui::mojom::WindowManager::kRenderParentTitleArea_Property, 90 ui::mojom::WindowManager::kRenderParentTitleArea_Property,
91 aura::PropertyConverter::CreateAcceptAnyValueCallback()); 91 aura::PropertyConverter::CreateAcceptAnyValueCallback());
92 property_converter_->RegisterProperty( 92 property_converter_->RegisterProperty(
93 kShelfIDKey, ui::mojom::WindowManager::kShelfID_Property, 93 kShelfIDKey, ui::mojom::WindowManager::kShelfID_Property);
94 aura::PropertyConverter::CreateAcceptAnyValueCallback());
95 property_converter_->RegisterProperty( 94 property_converter_->RegisterProperty(
96 kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property, 95 kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property,
97 base::Bind(&IsValidShelfItemType)); 96 base::Bind(&IsValidShelfItemType));
98 property_converter_->RegisterProperty( 97 property_converter_->RegisterProperty(
99 ::wm::kShadowElevationKey, 98 ::wm::kShadowElevationKey,
100 ui::mojom::WindowManager::kShadowElevation_Property, 99 ui::mojom::WindowManager::kShadowElevation_Property,
101 base::Bind(&::wm::IsValidShadowElevation)); 100 base::Bind(&::wm::IsValidShadowElevation));
102 property_converter_->RegisterProperty(kWindowPinTypeKey, 101 property_converter_->RegisterProperty(kWindowPinTypeKey,
103 ash::mojom::kWindowPinType_Property, 102 ash::mojom::kWindowPinType_Property,
104 base::Bind(&ash::IsValidWindowPinType)); 103 base::Bind(&ash::IsValidWindowPinType));
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 bool WindowManager::IsWindowActive(aura::Window* window) { 581 bool WindowManager::IsWindowActive(aura::Window* window) {
583 return Shell::Get()->activation_client()->GetActiveWindow() == window; 582 return Shell::Get()->activation_client()->GetActiveWindow() == window;
584 } 583 }
585 584
586 void WindowManager::OnWmDeactivateWindow(aura::Window* window) { 585 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
587 Shell::Get()->activation_client()->DeactivateWindow(window); 586 Shell::Get()->activation_client()->DeactivateWindow(window);
588 } 587 }
589 588
590 } // namespace mus 589 } // namespace mus
591 } // namespace ash 590 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/mus_property_mirror_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698