Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Side by Side Diff: ash/wm/workspace/workspace_layout_manager.cc

Issue 2871813002: Converts remaining usage of WmLayoutManager to aura::LayoutManager (Closed)
Patch Set: cleanup Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.h ('k') | ash/wm_layout_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/workspace/workspace_layout_manager.h" 5 #include "ash/wm/workspace/workspace_layout_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/keyboard/keyboard_observer_register.h" 9 #include "ash/keyboard/keyboard_observer_register.h"
10 #include "ash/public/cpp/shell_window_ids.h" 10 #include "ash/public/cpp/shell_window_ids.h"
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 // from fullscreen, the temporarily disabled always-on-top property will be 335 // from fullscreen, the temporarily disabled always-on-top property will be
336 // restored. 336 // restored.
337 return; 337 return;
338 } 338 }
339 339
340 UpdateAlwaysOnTop(is_pinned ? pinned_window->aura_window() : nullptr); 340 UpdateAlwaysOnTop(is_pinned ? pinned_window->aura_window() : nullptr);
341 } 341 }
342 342
343 void WorkspaceLayoutManager::OnVirtualKeyboardStateChanged( 343 void WorkspaceLayoutManager::OnVirtualKeyboardStateChanged(
344 bool activated, 344 bool activated,
345 WmWindow* root_window) { 345 aura::Window* root_window) {
346 UpdateKeyboardObserverFromStateChanged( 346 UpdateKeyboardObserverFromStateChanged(activated, root_window, root_window_,
347 activated, root_window, WmWindow::Get(root_window_), &keyboard_observer_); 347 &keyboard_observer_);
348 } 348 }
349 349
350 ////////////////////////////////////////////////////////////////////////////// 350 //////////////////////////////////////////////////////////////////////////////
351 // WorkspaceLayoutManager, private: 351 // WorkspaceLayoutManager, private:
352 352
353 void WorkspaceLayoutManager::AdjustAllWindowsBoundsForWorkAreaChange( 353 void WorkspaceLayoutManager::AdjustAllWindowsBoundsForWorkAreaChange(
354 const wm::WMEvent* event) { 354 const wm::WMEvent* event) {
355 DCHECK(event->type() == wm::WM_EVENT_DISPLAY_BOUNDS_CHANGED || 355 DCHECK(event->type() == wm::WM_EVENT_DISPLAY_BOUNDS_CHANGED ||
356 event->type() == wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED); 356 event->type() == wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
357 357
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 for (aura::Window* window : windows) { 403 for (aura::Window* window : windows) {
404 wm::WindowState* window_state = wm::GetWindowState(window); 404 wm::WindowState* window_state = wm::GetWindowState(window);
405 if (window_on_top) 405 if (window_on_top)
406 window_state->DisableAlwaysOnTop(WmWindow::Get(window_on_top)); 406 window_state->DisableAlwaysOnTop(WmWindow::Get(window_on_top));
407 else 407 else
408 window_state->RestoreAlwaysOnTop(); 408 window_state->RestoreAlwaysOnTop();
409 } 409 }
410 } 410 }
411 411
412 } // namespace ash 412 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.h ('k') | ash/wm_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698