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

Side by Side Diff: ash/root_window_controller.cc

Issue 2843193002: chromeos: fix focus for mushrome (Closed)
Patch Set: feedback 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/mus/window_manager_common_unittests.cc ('k') | ash/shell.cc » ('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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <queue> 8 #include <queue>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 capture_client_.reset(new ::wm::ScopedCaptureClient(root_window)); 746 capture_client_.reset(new ::wm::ScopedCaptureClient(root_window));
747 } 747 }
748 748
749 void RootWindowController::Init(RootWindowType root_window_type) { 749 void RootWindowController::Init(RootWindowType root_window_type) {
750 aura::Window* root_window = GetRootWindow(); 750 aura::Window* root_window = GetRootWindow();
751 ShellPort* shell_port = ShellPort::Get(); 751 ShellPort* shell_port = ShellPort::Get();
752 Shell* shell = Shell::Get(); 752 Shell* shell = Shell::Get();
753 shell->InitRootWindow(root_window); 753 shell->InitRootWindow(root_window);
754 754
755 CreateContainers(); 755 CreateContainers();
756 ShellPort::Get()->OnCreatedRootWindowContainers(this);
756 757
757 CreateSystemWallpaper(root_window_type); 758 CreateSystemWallpaper(root_window_type);
758 759
759 InitLayoutManagers(); 760 InitLayoutManagers();
760 InitTouchHuds(); 761 InitTouchHuds();
761 762
762 if (shell_port->GetPrimaryRootWindowController() 763 if (shell_port->GetPrimaryRootWindowController()
763 ->GetSystemModalLayoutManager(nullptr) 764 ->GetSystemModalLayoutManager(nullptr)
764 ->has_window_dimmer()) { 765 ->has_window_dimmer()) {
765 GetSystemModalLayoutManager(nullptr)->CreateModalBackground(); 766 GetSystemModalLayoutManager(nullptr)->CreateModalBackground();
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
1105 EnableTouchHudProjection(); 1106 EnableTouchHudProjection();
1106 else 1107 else
1107 DisableTouchHudProjection(); 1108 DisableTouchHudProjection();
1108 } 1109 }
1109 1110
1110 RootWindowController* GetRootWindowController(const aura::Window* root_window) { 1111 RootWindowController* GetRootWindowController(const aura::Window* root_window) {
1111 return root_window ? GetRootWindowSettings(root_window)->controller : nullptr; 1112 return root_window ? GetRootWindowSettings(root_window)->controller : nullptr;
1112 } 1113 }
1113 1114
1114 } // namespace ash 1115 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/window_manager_common_unittests.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698