Chromium Code Reviews| 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 #include "ash/common/wm_window.h" | 5 #include "ash/common/wm_window.h" |
| 6 | 6 |
| 7 #include "ash/aura/aura_layout_manager_adapter.h" | 7 #include "ash/aura/aura_layout_manager_adapter.h" |
| 8 #include "ash/aura/wm_shell_aura.h" | 8 #include "ash/aura/wm_shell_aura.h" |
| 9 #include "ash/common/ash_constants.h" | 9 #include "ash/common/ash_constants.h" |
| 10 #include "ash/common/shelf/shelf_item_types.h" | 10 #include "ash/common/shelf/shelf_item_types.h" |
| (...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 953 } else if (old_state == ui::SHOW_STATE_MINIMIZED) { | 953 } else if (old_state == ui::SHOW_STATE_MINIMIZED) { |
| 954 Unminimize(); | 954 Unminimize(); |
| 955 } else { | 955 } else { |
| 956 NOTREACHED(); | 956 NOTREACHED(); |
| 957 } | 957 } |
| 958 } else { | 958 } else { |
| 959 ash::wm::GetWindowState(window_)->OnWindowShowStateChanged(); | 959 ash::wm::GetWindowState(window_)->OnWindowShowStateChanged(); |
| 960 } | 960 } |
| 961 return; | 961 return; |
| 962 } | 962 } |
| 963 if (key == aura::client::kImmersiveFullscreenKey) { | |
| 964 bool enable = window_->GetProperty(aura::client::kImmersiveFullscreenKey); | |
|
sky
2017/01/23 21:48:56
You'll need to mirror this to a WindowManager prop
Peng
2017/01/25 16:18:57
Done.
| |
| 965 GetWindowState()->set_in_immersive_fullscreen(enable); | |
| 966 return; | |
| 967 } | |
| 963 WmWindowProperty wm_property; | 968 WmWindowProperty wm_property; |
| 964 if (key == aura::client::kAlwaysOnTopKey) { | 969 if (key == aura::client::kAlwaysOnTopKey) { |
| 965 wm_property = WmWindowProperty::ALWAYS_ON_TOP; | 970 wm_property = WmWindowProperty::ALWAYS_ON_TOP; |
| 966 } else if (key == aura::client::kAppIconKey) { | 971 } else if (key == aura::client::kAppIconKey) { |
| 967 wm_property = WmWindowProperty::APP_ICON; | 972 wm_property = WmWindowProperty::APP_ICON; |
| 968 } else if (key == aura::client::kDrawAttentionKey) { | 973 } else if (key == aura::client::kDrawAttentionKey) { |
| 969 wm_property = WmWindowProperty::DRAW_ATTENTION; | 974 wm_property = WmWindowProperty::DRAW_ATTENTION; |
| 970 } else if (key == aura::client::kModalKey) { | 975 } else if (key == aura::client::kModalKey) { |
| 971 wm_property = WmWindowProperty::MODAL_TYPE; | 976 wm_property = WmWindowProperty::MODAL_TYPE; |
| 972 } else if (key == kPanelAttachedKey) { | 977 } else if (key == kPanelAttachedKey) { |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1027 observer.OnTransientChildAdded(this, Get(transient)); | 1032 observer.OnTransientChildAdded(this, Get(transient)); |
| 1028 } | 1033 } |
| 1029 | 1034 |
| 1030 void WmWindow::OnTransientChildRemoved(aura::Window* window, | 1035 void WmWindow::OnTransientChildRemoved(aura::Window* window, |
| 1031 aura::Window* transient) { | 1036 aura::Window* transient) { |
| 1032 for (auto& observer : transient_observers_) | 1037 for (auto& observer : transient_observers_) |
| 1033 observer.OnTransientChildRemoved(this, Get(transient)); | 1038 observer.OnTransientChildRemoved(this, Get(transient)); |
| 1034 } | 1039 } |
| 1035 | 1040 |
| 1036 } // namespace ash | 1041 } // namespace ash |
| OLD | NEW |