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

Side by Side Diff: ash/shell.cc

Issue 76583003: Rename RootWindowHost* to WindowTreeHost* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years 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/shell.h ('k') | ash/shell/shell_delegate_impl.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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/accelerators/accelerator_controller.h" 10 #include "ash/accelerators/accelerator_controller.h"
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 AddPreTargetHandler(env_filter_.get()); 778 AddPreTargetHandler(env_filter_.get());
779 779
780 views::corewm::FocusController* focus_controller = 780 views::corewm::FocusController* focus_controller =
781 new views::corewm::FocusController(new wm::AshFocusRules); 781 new views::corewm::FocusController(new wm::AshFocusRules);
782 focus_client_.reset(focus_controller); 782 focus_client_.reset(focus_controller);
783 activation_client_ = focus_controller; 783 activation_client_ = focus_controller;
784 activation_client_->AddObserver(this); 784 activation_client_->AddObserver(this);
785 focus_cycler_.reset(new internal::FocusCycler()); 785 focus_cycler_.reset(new internal::FocusCycler());
786 786
787 screen_position_controller_.reset(new internal::ScreenPositionController); 787 screen_position_controller_.reset(new internal::ScreenPositionController);
788 root_window_host_factory_.reset(delegate_->CreateRootWindowHostFactory()); 788 root_window_host_factory_.reset(delegate_->CreateWindowTreeHostFactory());
789 789
790 display_controller_->Start(); 790 display_controller_->Start();
791 display_controller_->InitPrimaryDisplay(); 791 display_controller_->InitPrimaryDisplay();
792 aura::Window* root_window = display_controller_->GetPrimaryRootWindow(); 792 aura::Window* root_window = display_controller_->GetPrimaryRootWindow();
793 target_root_window_ = root_window; 793 target_root_window_ = root_window;
794 794
795 resolution_notification_controller_.reset( 795 resolution_notification_controller_.reset(
796 new internal::ResolutionNotificationController); 796 new internal::ResolutionNotificationController);
797 797
798 cursor_manager_.SetDisplay(DisplayController::GetPrimaryDisplay()); 798 cursor_manager_.SetDisplay(DisplayController::GetPrimaryDisplay());
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 //////////////////////////////////////////////////////////////////////////////// 1041 ////////////////////////////////////////////////////////////////////////////////
1042 // Shell, aura::client::ActivationChangeObserver implementation: 1042 // Shell, aura::client::ActivationChangeObserver implementation:
1043 1043
1044 void Shell::OnWindowActivated(aura::Window* gained_active, 1044 void Shell::OnWindowActivated(aura::Window* gained_active,
1045 aura::Window* lost_active) { 1045 aura::Window* lost_active) {
1046 if (gained_active) 1046 if (gained_active)
1047 target_root_window_ = gained_active->GetRootWindow(); 1047 target_root_window_ = gained_active->GetRootWindow();
1048 } 1048 }
1049 1049
1050 } // namespace ash 1050 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698