OLD | NEW |
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 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 wm_shelf_aura_(new WmShelfAura), | 411 wm_shelf_aura_(new WmShelfAura), |
412 touch_hud_debug_(NULL), | 412 touch_hud_debug_(NULL), |
413 touch_hud_projection_(NULL) { | 413 touch_hud_projection_(NULL) { |
414 aura::Window* root_window = GetRootWindow(); | 414 aura::Window* root_window = GetRootWindow(); |
415 GetRootWindowSettings(root_window)->controller = this; | 415 GetRootWindowSettings(root_window)->controller = this; |
416 | 416 |
417 // Has to happen after this is set as |controller| of RootWindowSettings. | 417 // Has to happen after this is set as |controller| of RootWindowSettings. |
418 wm_root_window_controller_ = WmRootWindowControllerAura::Get(root_window); | 418 wm_root_window_controller_ = WmRootWindowControllerAura::Get(root_window); |
419 | 419 |
420 stacking_controller_.reset(new StackingController); | 420 stacking_controller_.reset(new StackingController); |
421 aura::client::SetWindowTreeClient(root_window, stacking_controller_.get()); | 421 aura::client::SetWindowParentingClient(root_window, |
| 422 stacking_controller_.get()); |
422 capture_client_.reset(new ::wm::ScopedCaptureClient(root_window)); | 423 capture_client_.reset(new ::wm::ScopedCaptureClient(root_window)); |
423 } | 424 } |
424 | 425 |
425 void RootWindowController::Init(RootWindowType root_window_type, | 426 void RootWindowController::Init(RootWindowType root_window_type, |
426 bool first_run_after_boot) { | 427 bool first_run_after_boot) { |
427 aura::Window* root_window = GetRootWindow(); | 428 aura::Window* root_window = GetRootWindow(); |
428 Shell* shell = Shell::GetInstance(); | 429 Shell* shell = Shell::GetInstance(); |
429 shell->InitRootWindow(root_window); | 430 shell->InitRootWindow(root_window); |
430 | 431 |
431 wm_root_window_controller_->CreateContainers(); | 432 wm_root_window_controller_->CreateContainers(); |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
560 EnableTouchHudProjection(); | 561 EnableTouchHudProjection(); |
561 else | 562 else |
562 DisableTouchHudProjection(); | 563 DisableTouchHudProjection(); |
563 } | 564 } |
564 | 565 |
565 RootWindowController* GetRootWindowController(const aura::Window* root_window) { | 566 RootWindowController* GetRootWindowController(const aura::Window* root_window) { |
566 return root_window ? GetRootWindowSettings(root_window)->controller : nullptr; | 567 return root_window ? GetRootWindowSettings(root_window)->controller : nullptr; |
567 } | 568 } |
568 | 569 |
569 } // namespace ash | 570 } // namespace ash |
OLD | NEW |