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

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

Issue 2778733004: Add WindowPinType property on arua::Window (Closed)
Patch Set: Address review issues Created 3 years, 8 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
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property, 82 kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property,
83 aura::PropertyConverter::CreateAcceptAnyValueCallback()); 83 aura::PropertyConverter::CreateAcceptAnyValueCallback());
84 property_converter_->RegisterProperty( 84 property_converter_->RegisterProperty(
85 kRenderTitleAreaProperty, 85 kRenderTitleAreaProperty,
86 ui::mojom::WindowManager::kRenderParentTitleArea_Property, 86 ui::mojom::WindowManager::kRenderParentTitleArea_Property,
87 aura::PropertyConverter::CreateAcceptAnyValueCallback()); 87 aura::PropertyConverter::CreateAcceptAnyValueCallback());
88 property_converter_->RegisterProperty( 88 property_converter_->RegisterProperty(
89 kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property, 89 kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property,
90 base::Bind(&IsValidShelfItemType)); 90 base::Bind(&IsValidShelfItemType));
91 property_converter_->RegisterProperty( 91 property_converter_->RegisterProperty(
92 kWindowPinTypeKey, ui::mojom::WindowManager::kWindowPinType_Property,
93 base::Bind(&IsValidWindowPinType));
94 property_converter_->RegisterProperty(
92 ::wm::kShadowElevationKey, 95 ::wm::kShadowElevationKey,
93 ui::mojom::WindowManager::kShadowElevation_Property, 96 ui::mojom::WindowManager::kShadowElevation_Property,
94 base::Bind(&::wm::IsValidShadowElevation)); 97 base::Bind(&::wm::IsValidShadowElevation));
95 } 98 }
96 99
97 WindowManager::~WindowManager() { 100 WindowManager::~WindowManager() {
98 Shutdown(); 101 Shutdown();
99 ash::Shell::set_window_tree_client(nullptr); 102 ash::Shell::set_window_tree_client(nullptr);
100 ash::Shell::set_window_manager_client(nullptr); 103 ash::Shell::set_window_manager_client(nullptr);
101 } 104 }
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 bool WindowManager::IsWindowActive(aura::Window* window) { 560 bool WindowManager::IsWindowActive(aura::Window* window) {
558 return Shell::GetInstance()->activation_client()->GetActiveWindow() == window; 561 return Shell::GetInstance()->activation_client()->GetActiveWindow() == window;
559 } 562 }
560 563
561 void WindowManager::OnWmDeactivateWindow(aura::Window* window) { 564 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
562 Shell::GetInstance()->activation_client()->DeactivateWindow(window); 565 Shell::GetInstance()->activation_client()->DeactivateWindow(window);
563 } 566 }
564 567
565 } // namespace mus 568 } // namespace mus
566 } // namespace ash 569 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698