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/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
9 #include "ash/screen_util.h" | 9 #include "ash/screen_util.h" |
10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 case ui::SHOW_STATE_NORMAL: | 64 case ui::SHOW_STATE_NORMAL: |
65 return WM_EVENT_NORMAL; | 65 return WM_EVENT_NORMAL; |
66 case ui::SHOW_STATE_MINIMIZED: | 66 case ui::SHOW_STATE_MINIMIZED: |
67 return WM_EVENT_MINIMIZE; | 67 return WM_EVENT_MINIMIZE; |
68 case ui::SHOW_STATE_MAXIMIZED: | 68 case ui::SHOW_STATE_MAXIMIZED: |
69 return WM_EVENT_MAXIMIZE; | 69 return WM_EVENT_MAXIMIZE; |
70 case ui::SHOW_STATE_FULLSCREEN: | 70 case ui::SHOW_STATE_FULLSCREEN: |
71 return WM_EVENT_FULLSCREEN; | 71 return WM_EVENT_FULLSCREEN; |
72 case ui::SHOW_STATE_INACTIVE: | 72 case ui::SHOW_STATE_INACTIVE: |
73 return WM_EVENT_SHOW_INACTIVE; | 73 return WM_EVENT_SHOW_INACTIVE; |
| 74 case ui::SHOW_STATE_DOCKED: |
| 75 return WM_EVENT_DOCK; |
74 case ui::SHOW_STATE_END: | 76 case ui::SHOW_STATE_END: |
75 NOTREACHED() << "No WMEvent defined for the show state:" | 77 NOTREACHED() << "No WMEvent defined for the show state:" |
76 << requested_show_state; | 78 << requested_show_state; |
77 } | 79 } |
78 return WM_EVENT_NORMAL; | 80 return WM_EVENT_NORMAL; |
79 } | 81 } |
80 | 82 |
81 } // namespace | 83 } // namespace |
82 | 84 |
83 WindowState::~WindowState() { | 85 WindowState::~WindowState() { |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
451 } | 453 } |
452 return settings; | 454 return settings; |
453 } | 455 } |
454 | 456 |
455 const WindowState* GetWindowState(const aura::Window* window) { | 457 const WindowState* GetWindowState(const aura::Window* window) { |
456 return GetWindowState(const_cast<aura::Window*>(window)); | 458 return GetWindowState(const_cast<aura::Window*>(window)); |
457 } | 459 } |
458 | 460 |
459 } // namespace wm | 461 } // namespace wm |
460 } // namespace ash | 462 } // namespace ash |
OLD | NEW |