| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ | 5 #ifndef ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ |
| 6 #define ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ | 6 #define ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/common/shell_window_ids.h" |
| 10 #include "ash/common/wm_window.h" | 11 #include "ash/common/wm_window.h" |
| 11 #include "base/macros.h" | 12 #include "base/macros.h" |
| 12 #include "base/observer_list.h" | 13 #include "base/observer_list.h" |
| 13 #include "components/mus/public/cpp/window_observer.h" | 14 #include "components/mus/public/cpp/window_observer.h" |
| 14 | 15 |
| 15 namespace views { | 16 namespace views { |
| 16 class Widget; | 17 class Widget; |
| 17 } | 18 } |
| 18 | 19 |
| 19 namespace ash { | 20 namespace ash { |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 const std::vector<uint8_t>* new_data) override; | 218 const std::vector<uint8_t>* new_data) override; |
| 218 void OnWindowBoundsChanged(::mus::Window* window, | 219 void OnWindowBoundsChanged(::mus::Window* window, |
| 219 const gfx::Rect& old_bounds, | 220 const gfx::Rect& old_bounds, |
| 220 const gfx::Rect& new_bounds) override; | 221 const gfx::Rect& new_bounds) override; |
| 221 void OnWindowDestroying(::mus::Window* window) override; | 222 void OnWindowDestroying(::mus::Window* window) override; |
| 222 | 223 |
| 223 ::mus::Window* window_; | 224 ::mus::Window* window_; |
| 224 | 225 |
| 225 // The shell window id of this window. Shell window ids are defined in | 226 // The shell window id of this window. Shell window ids are defined in |
| 226 // ash/common/shell_window_ids.h. | 227 // ash/common/shell_window_ids.h. |
| 227 int shell_window_id_ = -1; | 228 int shell_window_id_ = kShellWindowId_Invalid; |
| 228 | 229 |
| 229 std::unique_ptr<wm::WindowState> window_state_; | 230 std::unique_ptr<wm::WindowState> window_state_; |
| 230 | 231 |
| 231 views::Widget* widget_ = nullptr; | 232 views::Widget* widget_ = nullptr; |
| 232 | 233 |
| 233 WidgetCreationType widget_creation_type_ = WidgetCreationType::INTERNAL; | 234 WidgetCreationType widget_creation_type_ = WidgetCreationType::INTERNAL; |
| 234 | 235 |
| 235 base::ObserverList<WmWindowObserver> observers_; | 236 base::ObserverList<WmWindowObserver> observers_; |
| 236 | 237 |
| 237 std::unique_ptr<MusLayoutManagerAdapter> layout_manager_adapter_; | 238 std::unique_ptr<MusLayoutManagerAdapter> layout_manager_adapter_; |
| 238 | 239 |
| 239 std::unique_ptr<gfx::Rect> restore_bounds_in_screen_; | 240 std::unique_ptr<gfx::Rect> restore_bounds_in_screen_; |
| 240 | 241 |
| 241 ui::WindowShowState restore_show_state_ = ui::SHOW_STATE_DEFAULT; | 242 ui::WindowShowState restore_show_state_ = ui::SHOW_STATE_DEFAULT; |
| 242 | 243 |
| 243 bool snap_children_to_pixel_boundary_ = false; | 244 bool snap_children_to_pixel_boundary_ = false; |
| 244 | 245 |
| 245 // If true child windows should get a slightly larger hit region to make | 246 // If true child windows should get a slightly larger hit region to make |
| 246 // resizing easier. | 247 // resizing easier. |
| 247 bool children_use_extended_hit_region_ = false; | 248 bool children_use_extended_hit_region_ = false; |
| 248 | 249 |
| 249 DISALLOW_COPY_AND_ASSIGN(WmWindowMus); | 250 DISALLOW_COPY_AND_ASSIGN(WmWindowMus); |
| 250 }; | 251 }; |
| 251 | 252 |
| 252 } // namespace mus | 253 } // namespace mus |
| 253 } // namespace ash | 254 } // namespace ash |
| 254 | 255 |
| 255 #endif // ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ | 256 #endif // ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ |
| OLD | NEW |