| 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/property_util.h" | 5 #include "ash/mus/property_util.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "ash/mus/shadow.h" | 9 #include "ash/mus/shadow.h" |
| 10 #include "services/ui/public/cpp/property_type_converters.h" | 10 #include "services/ui/public/cpp/property_type_converters.h" |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 case ui::mojom::WindowType::POPUP: | 156 case ui::mojom::WindowType::POPUP: |
| 157 case ui::mojom::WindowType::BUBBLE: | 157 case ui::mojom::WindowType::BUBBLE: |
| 158 case ui::mojom::WindowType::DRAG: | 158 case ui::mojom::WindowType::DRAG: |
| 159 return ui::wm::WINDOW_TYPE_POPUP; | 159 return ui::wm::WINDOW_TYPE_POPUP; |
| 160 | 160 |
| 161 case ui::mojom::WindowType::MENU: | 161 case ui::mojom::WindowType::MENU: |
| 162 return ui::wm::WINDOW_TYPE_MENU; | 162 return ui::wm::WINDOW_TYPE_MENU; |
| 163 | 163 |
| 164 case ui::mojom::WindowType::TOOLTIP: | 164 case ui::mojom::WindowType::TOOLTIP: |
| 165 return ui::wm::WINDOW_TYPE_TOOLTIP; | 165 return ui::wm::WINDOW_TYPE_TOOLTIP; |
| 166 |
| 167 case ui::mojom::WindowType::UNKNOWN: |
| 168 return ui::wm::WINDOW_TYPE_UNKNOWN; |
| 166 } | 169 } |
| 167 | 170 |
| 168 return ui::wm::WINDOW_TYPE_UNKNOWN; | 171 return ui::wm::WINDOW_TYPE_UNKNOWN; |
| 169 } | 172 } |
| 170 | 173 |
| 171 mojom::AshWindowType GetAshWindowType(const ui::Window* window) { | 174 mojom::AshWindowType GetAshWindowType(const ui::Window* window) { |
| 172 if (!window->HasSharedProperty(mojom::kAshWindowType_Property)) | 175 if (!window->HasSharedProperty(mojom::kAshWindowType_Property)) |
| 173 return mojom::AshWindowType::COUNT; | 176 return mojom::AshWindowType::COUNT; |
| 174 | 177 |
| 175 return static_cast<mojom::AshWindowType>( | 178 return static_cast<mojom::AshWindowType>( |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 | 276 |
| 274 bool GetExcludeFromMru(const ui::Window* window) { | 277 bool GetExcludeFromMru(const ui::Window* window) { |
| 275 return window->HasSharedProperty( | 278 return window->HasSharedProperty( |
| 276 ui::mojom::WindowManager::kExcludeFromMru_Property) && | 279 ui::mojom::WindowManager::kExcludeFromMru_Property) && |
| 277 window->GetSharedProperty<bool>( | 280 window->GetSharedProperty<bool>( |
| 278 ui::mojom::WindowManager::kExcludeFromMru_Property); | 281 ui::mojom::WindowManager::kExcludeFromMru_Property); |
| 279 } | 282 } |
| 280 | 283 |
| 281 } // namespace mus | 284 } // namespace mus |
| 282 } // namespace ash | 285 } // namespace ash |
| OLD | NEW |