| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/wm/window_state.h" | 5 #include "ash/wm/window_state.h" |
| 6 | 6 |
| 7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/screen_ash.h" | 8 #include "ash/screen_ash.h" |
| 9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
| 10 #include "ash/wm/window_properties.h" | 10 #include "ash/wm/window_properties.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 tracked_by_workspace_(true), | 31 tracked_by_workspace_(true), |
| 32 window_position_managed_(false), | 32 window_position_managed_(false), |
| 33 bounds_changed_by_user_(false), | 33 bounds_changed_by_user_(false), |
| 34 panel_attached_(true), | 34 panel_attached_(true), |
| 35 continue_drag_after_reparent_(false), | 35 continue_drag_after_reparent_(false), |
| 36 ignored_by_shelf_(false), | 36 ignored_by_shelf_(false), |
| 37 can_consume_system_keys_(false), | 37 can_consume_system_keys_(false), |
| 38 top_row_keys_are_function_keys_(false), | 38 top_row_keys_are_function_keys_(false), |
| 39 window_resizer_(NULL), | 39 window_resizer_(NULL), |
| 40 always_restores_to_restore_bounds_(false), | 40 always_restores_to_restore_bounds_(false), |
| 41 hide_shelf_when_fullscreen_(true), |
| 41 window_show_type_(ToWindowShowType(GetShowState())) { | 42 window_show_type_(ToWindowShowType(GetShowState())) { |
| 42 window_->AddObserver(this); | 43 window_->AddObserver(this); |
| 43 } | 44 } |
| 44 | 45 |
| 45 WindowState::~WindowState() { | 46 WindowState::~WindowState() { |
| 46 } | 47 } |
| 47 | 48 |
| 48 ui::WindowShowState WindowState::GetShowState() const { | 49 ui::WindowShowState WindowState::GetShowState() const { |
| 49 return window_->GetProperty(aura::client::kShowStateKey); | 50 return window_->GetProperty(aura::client::kShowStateKey); |
| 50 } | 51 } |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 } | 271 } |
| 271 return settings; | 272 return settings; |
| 272 } | 273 } |
| 273 | 274 |
| 274 const WindowState* GetWindowState(const aura::Window* window) { | 275 const WindowState* GetWindowState(const aura::Window* window) { |
| 275 return GetWindowState(const_cast<aura::Window*>(window)); | 276 return GetWindowState(const_cast<aura::Window*>(window)); |
| 276 } | 277 } |
| 277 | 278 |
| 278 } // namespace wm | 279 } // namespace wm |
| 279 } // namespace ash | 280 } // namespace ash |
| OLD | NEW |