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

Side by Side Diff: ash/root_window_controller.cc

Issue 36473003: Rename StackingClient -> WindowTreeClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: done. Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/root_window_controller_unittest.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 <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_constants.h" 10 #include "ash/ash_constants.h"
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 : root_window_(root_window), 558 : root_window_(root_window),
559 root_window_layout_(NULL), 559 root_window_layout_(NULL),
560 docked_layout_manager_(NULL), 560 docked_layout_manager_(NULL),
561 panel_layout_manager_(NULL), 561 panel_layout_manager_(NULL),
562 touch_hud_debug_(NULL), 562 touch_hud_debug_(NULL),
563 touch_hud_projection_(NULL) { 563 touch_hud_projection_(NULL) {
564 GetRootWindowSettings(root_window)->controller = this; 564 GetRootWindowSettings(root_window)->controller = this;
565 screen_dimmer_.reset(new ScreenDimmer(root_window)); 565 screen_dimmer_.reset(new ScreenDimmer(root_window));
566 566
567 stacking_controller_.reset(new StackingController); 567 stacking_controller_.reset(new StackingController);
568 aura::client::SetStackingClient(root_window, stacking_controller_.get()); 568 aura::client::SetWindowTreeClient(root_window, stacking_controller_.get());
569 capture_client_.reset(new views::corewm::ScopedCaptureClient(root_window)); 569 capture_client_.reset(new views::corewm::ScopedCaptureClient(root_window));
570 } 570 }
571 571
572 void RootWindowController::Init(bool is_primary, bool first_run_after_boot) { 572 void RootWindowController::Init(bool is_primary, bool first_run_after_boot) {
573 Shell::GetInstance()->InitRootWindow(root_window_.get()); 573 Shell::GetInstance()->InitRootWindow(root_window_.get());
574 574
575 root_window_->SetCursor(ui::kCursorPointer); 575 root_window_->SetCursor(ui::kCursorPointer);
576 CreateContainersInRootWindow(root_window_.get()); 576 CreateContainersInRootWindow(root_window_.get());
577 CreateSystemBackground(first_run_after_boot); 577 CreateSystemBackground(first_run_after_boot);
578 578
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 DisableTouchHudProjection(); 886 DisableTouchHudProjection();
887 } 887 }
888 888
889 RootWindowController* GetRootWindowController( 889 RootWindowController* GetRootWindowController(
890 const aura::RootWindow* root_window) { 890 const aura::RootWindow* root_window) {
891 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; 891 return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
892 } 892 }
893 893
894 } // namespace internal 894 } // namespace internal
895 } // namespace ash 895 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698