| OLD | NEW |
| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 WindowManager::WindowManager(service_manager::Connector* connector) | 78 WindowManager::WindowManager(service_manager::Connector* connector) |
| 79 : connector_(connector), | 79 : connector_(connector), |
| 80 focus_controller_(base::MakeUnique<::wm::FocusController>( | 80 focus_controller_(base::MakeUnique<::wm::FocusController>( |
| 81 new ::ash::wm::AshFocusRules())), | 81 new ::ash::wm::AshFocusRules())), |
| 82 wm_state_(base::MakeUnique<::wm::WMState>()), | 82 wm_state_(base::MakeUnique<::wm::WMState>()), |
| 83 property_converter_(base::MakeUnique<aura::PropertyConverter>()), | 83 property_converter_(base::MakeUnique<aura::PropertyConverter>()), |
| 84 event_client_(base::MakeUnique<EventClientImplMus>()), | 84 event_client_(base::MakeUnique<EventClientImplMus>()), |
| 85 screen_position_controller_( | 85 screen_position_controller_( |
| 86 base::MakeUnique<ScreenPositionController>()) { | 86 base::MakeUnique<ScreenPositionController>()) { |
| 87 property_converter_->RegisterProperty( | 87 property_converter_->RegisterProperty( |
| 88 kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property); |
| 89 property_converter_->RegisterProperty( |
| 88 kRenderTitleAreaProperty, | 90 kRenderTitleAreaProperty, |
| 89 ui::mojom::WindowManager::kRenderParentTitleArea_Property); | 91 ui::mojom::WindowManager::kRenderParentTitleArea_Property); |
| 90 property_converter_->RegisterProperty( | 92 property_converter_->RegisterProperty( |
| 91 kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property); | 93 kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property); |
| 92 } | 94 } |
| 93 | 95 |
| 94 WindowManager::~WindowManager() { | 96 WindowManager::~WindowManager() { |
| 95 Shutdown(); | 97 Shutdown(); |
| 96 aura::Env::GetInstance()->RemoveObserver(this); | 98 aura::Env::GetInstance()->RemoveObserver(this); |
| 97 } | 99 } |
| (...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 | 513 |
| 512 void WindowManager::OnWindowInitialized(aura::Window* window) { | 514 void WindowManager::OnWindowInitialized(aura::Window* window) { |
| 513 // This ensures WmWindowAura won't be called before WmWindowMus. This is | 515 // This ensures WmWindowAura won't be called before WmWindowMus. This is |
| 514 // important as if WmWindowAura::Get() is called first, then WmWindowAura | 516 // important as if WmWindowAura::Get() is called first, then WmWindowAura |
| 515 // would be created, not WmWindowMus. | 517 // would be created, not WmWindowMus. |
| 516 WmWindowMus::Get(window); | 518 WmWindowMus::Get(window); |
| 517 } | 519 } |
| 518 | 520 |
| 519 } // namespace mus | 521 } // namespace mus |
| 520 } // namespace ash | 522 } // namespace ash |
| OLD | NEW |