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 919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 930 observer.OnWindowStackingChanged(this); | 930 observer.OnWindowStackingChanged(this); |
| 931 } | 931 } |
| 932 | 932 |
| 933 void WmWindow::OnWindowPropertyChanged(aura::Window* window, | 933 void WmWindow::OnWindowPropertyChanged(aura::Window* window, |
| 934 const void* key, | 934 const void* key, |
| 935 intptr_t old) { | 935 intptr_t old) { |
| 936 if (key == aura::client::kShowStateKey) { | 936 if (key == aura::client::kShowStateKey) { |
| 937 ash::wm::GetWindowState(window_)->OnWindowShowStateChanged(); | 937 ash::wm::GetWindowState(window_)->OnWindowShowStateChanged(); |
| 938 return; | 938 return; |
| 939 } | 939 } |
| 940 if (key == aura::client::kImmersiveFullscreenKey) { | |
|
sky
2017/01/25 17:42:12
The description doesn't match usage of the propert
Peng
2017/01/25 19:02:38
See [1], the in_immersive_fullscreen() is only use
| |
| 941 bool enable = window_->GetProperty(aura::client::kImmersiveFullscreenKey); | |
| 942 GetWindowState()->set_in_immersive_fullscreen(enable); | |
| 943 return; | |
| 944 } | |
| 940 WmWindowProperty wm_property; | 945 WmWindowProperty wm_property; |
| 941 if (key == aura::client::kAlwaysOnTopKey) { | 946 if (key == aura::client::kAlwaysOnTopKey) { |
| 942 wm_property = WmWindowProperty::ALWAYS_ON_TOP; | 947 wm_property = WmWindowProperty::ALWAYS_ON_TOP; |
| 943 } else if (key == aura::client::kAppIconKey) { | 948 } else if (key == aura::client::kAppIconKey) { |
| 944 wm_property = WmWindowProperty::APP_ICON; | 949 wm_property = WmWindowProperty::APP_ICON; |
| 945 } else if (key == aura::client::kDrawAttentionKey) { | 950 } else if (key == aura::client::kDrawAttentionKey) { |
| 946 wm_property = WmWindowProperty::DRAW_ATTENTION; | 951 wm_property = WmWindowProperty::DRAW_ATTENTION; |
| 947 } else if (key == aura::client::kModalKey) { | 952 } else if (key == aura::client::kModalKey) { |
| 948 wm_property = WmWindowProperty::MODAL_TYPE; | 953 wm_property = WmWindowProperty::MODAL_TYPE; |
| 949 } else if (key == kPanelAttachedKey) { | 954 } else if (key == kPanelAttachedKey) { |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1004 observer.OnTransientChildAdded(this, Get(transient)); | 1009 observer.OnTransientChildAdded(this, Get(transient)); |
| 1005 } | 1010 } |
| 1006 | 1011 |
| 1007 void WmWindow::OnTransientChildRemoved(aura::Window* window, | 1012 void WmWindow::OnTransientChildRemoved(aura::Window* window, |
| 1008 aura::Window* transient) { | 1013 aura::Window* transient) { |
| 1009 for (auto& observer : transient_observers_) | 1014 for (auto& observer : transient_observers_) |
| 1010 observer.OnTransientChildRemoved(this, Get(transient)); | 1015 observer.OnTransientChildRemoved(this, Get(transient)); |
| 1011 } | 1016 } |
| 1012 | 1017 |
| 1013 } // namespace ash | 1018 } // namespace ash |
| OLD | NEW |