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/aura/wm_shell_aura.h" | 5 #include "ash/aura/wm_shell_aura.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/aura/key_event_watcher_aura.h" | 9 #include "ash/aura/key_event_watcher_aura.h" |
| 10 #include "ash/aura/pointer_watcher_adapter.h" | 10 #include "ash/aura/pointer_watcher_adapter.h" |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 133 ->current_default_multi_display_mode() == | 133 ->current_default_multi_display_mode() == |
| 134 display::DisplayManager::UNIFIED; | 134 display::DisplayManager::UNIFIED; |
| 135 } | 135 } |
| 136 | 136 |
| 137 bool WmShellAura::IsForceMaximizeOnFirstRun() { | 137 bool WmShellAura::IsForceMaximizeOnFirstRun() { |
| 138 return delegate()->IsForceMaximizeOnFirstRun(); | 138 return delegate()->IsForceMaximizeOnFirstRun(); |
| 139 } | 139 } |
| 140 | 140 |
| 141 void WmShellAura::SetDisplayWorkAreaInsets(WmWindow* window, | 141 void WmShellAura::SetDisplayWorkAreaInsets(WmWindow* window, |
| 142 const gfx::Insets& insets) { | 142 const gfx::Insets& insets) { |
| 143 aura::Window* aura_window = WmWindow::GetAuraWindow(window); | 143 Shell::GetInstance() |
| 144 Shell::GetInstance()->SetDisplayWorkAreaInsets(aura_window, insets); | 144 ->window_tree_host_manager() |
| 145 ->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets); | |
|
msw
2017/02/16 18:34:49
q: what's your advice on using WmWindow::aura_wind
sky
2017/02/16 18:42:20
Get rid of WmWindow! ;)
Good question. I think it
| |
| 145 } | 146 } |
| 146 | 147 |
| 147 bool WmShellAura::IsPinned() { | 148 bool WmShellAura::IsPinned() { |
| 148 return Shell::GetInstance()->screen_pinning_controller()->IsPinned(); | 149 return Shell::GetInstance()->screen_pinning_controller()->IsPinned(); |
| 149 } | 150 } |
| 150 | 151 |
| 151 void WmShellAura::SetPinnedWindow(WmWindow* window) { | 152 void WmShellAura::SetPinnedWindow(WmWindow* window) { |
| 152 return Shell::GetInstance()->screen_pinning_controller()->SetPinnedWindow( | 153 return Shell::GetInstance()->screen_pinning_controller()->SetPinnedWindow( |
| 153 window); | 154 window); |
| 154 } | 155 } |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 309 for (auto& observer : display_observers_) | 310 for (auto& observer : display_observers_) |
| 310 observer.OnDisplayConfigurationChanging(); | 311 observer.OnDisplayConfigurationChanging(); |
| 311 } | 312 } |
| 312 | 313 |
| 313 void WmShellAura::OnDisplayConfigurationChanged() { | 314 void WmShellAura::OnDisplayConfigurationChanged() { |
| 314 for (auto& observer : display_observers_) | 315 for (auto& observer : display_observers_) |
| 315 observer.OnDisplayConfigurationChanged(); | 316 observer.OnDisplayConfigurationChanged(); |
| 316 } | 317 } |
| 317 | 318 |
| 318 } // namespace ash | 319 } // namespace ash |
| OLD | NEW |