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

Side by Side Diff: ash/root_window_controller.cc

Issue 2320273002: Refactors DimWindow and moves to ash/common (Closed)
Patch Set: git add wm_window Created 4 years, 3 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
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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/aura/aura_layout_manager_adapter.h" 10 #include "ash/aura/aura_layout_manager_adapter.h"
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 GetContainer(kShellWindowId_LockScreenContainersContainer); 403 GetContainer(kShellWindowId_LockScreenContainersContainer);
404 modal_container_id = kShellWindowId_LockSystemModalContainer; 404 modal_container_id = kShellWindowId_LockSystemModalContainer;
405 } else { 405 } else {
406 modal_container_id = kShellWindowId_SystemModalContainer; 406 modal_container_id = kShellWindowId_SystemModalContainer;
407 } 407 }
408 aura::Window* modal_container = GetContainer(modal_container_id); 408 aura::Window* modal_container = GetContainer(modal_container_id);
409 SystemModalContainerLayoutManager* modal_layout_manager = nullptr; 409 SystemModalContainerLayoutManager* modal_layout_manager = nullptr;
410 modal_layout_manager = static_cast<SystemModalContainerLayoutManager*>( 410 modal_layout_manager = static_cast<SystemModalContainerLayoutManager*>(
411 modal_container->layout_manager()); 411 modal_container->layout_manager());
412 412
413 if (modal_layout_manager->has_modal_background()) 413 if (modal_layout_manager->has_window_dimmer())
414 blocking_container = modal_container; 414 blocking_container = modal_container;
415 else 415 else
416 modal_container = nullptr; // Don't check modal dialogs. 416 modal_container = nullptr; // Don't check modal dialogs.
417 417
418 // In normal session. 418 // In normal session.
419 if (!blocking_container) 419 if (!blocking_container)
420 return true; 420 return true;
421 421
422 if (!IsWindowAboveContainer(window, blocking_container)) 422 if (!IsWindowAboveContainer(window, blocking_container))
423 return false; 423 return false;
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 shell->InitRootWindow(root_window); 756 shell->InitRootWindow(root_window);
757 757
758 wm_root_window_controller_->CreateContainers(); 758 wm_root_window_controller_->CreateContainers();
759 759
760 CreateSystemWallpaper(first_run_after_boot); 760 CreateSystemWallpaper(first_run_after_boot);
761 761
762 InitLayoutManagers(); 762 InitLayoutManagers();
763 InitTouchHuds(); 763 InitTouchHuds();
764 764
765 if (Shell::GetPrimaryRootWindowController() 765 if (Shell::GetPrimaryRootWindowController()
766 ->GetSystemModalLayoutManager(NULL) 766 ->GetSystemModalLayoutManager(nullptr)
767 ->has_modal_background()) { 767 ->has_window_dimmer()) {
768 GetSystemModalLayoutManager(NULL)->CreateModalBackground(); 768 GetSystemModalLayoutManager(nullptr)->CreateModalBackground();
769 } 769 }
770 770
771 WmShell::Get()->AddShellObserver(this); 771 WmShell::Get()->AddShellObserver(this);
772 772
773 wm_root_window_controller_->root_window_layout_manager()->OnWindowResized(); 773 wm_root_window_controller_->root_window_layout_manager()->OnWindowResized();
774 if (root_window_type == PRIMARY) { 774 if (root_window_type == PRIMARY) {
775 shell->InitKeyboard(); 775 shell->InitKeyboard();
776 } else { 776 } else {
777 ash_host_->AsWindowTreeHost()->Show(); 777 ash_host_->AsWindowTreeHost()->Show();
778 778
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 aura::Window* primary_root_window = Shell::GetInstance() 950 aura::Window* primary_root_window = Shell::GetInstance()
951 ->window_tree_host_manager() 951 ->window_tree_host_manager()
952 ->GetPrimaryRootWindow(); 952 ->GetPrimaryRootWindow();
953 return GetRootWindowSettings(primary_root_window)->controller; 953 return GetRootWindowSettings(primary_root_window)->controller;
954 } 954 }
955 955
956 return GetRootWindowSettings(root_window)->controller; 956 return GetRootWindowSettings(root_window)->controller;
957 } 957 }
958 958
959 } // namespace ash 959 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698