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

Side by Side Diff: ash/shell.cc

Issue 126513004: Rename RootWindowHost to WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 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/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 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 AddPreTargetHandler(env_filter_.get()); 774 AddPreTargetHandler(env_filter_.get());
775 775
776 views::corewm::FocusController* focus_controller = 776 views::corewm::FocusController* focus_controller =
777 new views::corewm::FocusController(new wm::AshFocusRules); 777 new views::corewm::FocusController(new wm::AshFocusRules);
778 focus_client_.reset(focus_controller); 778 focus_client_.reset(focus_controller);
779 activation_client_ = focus_controller; 779 activation_client_ = focus_controller;
780 activation_client_->AddObserver(this); 780 activation_client_->AddObserver(this);
781 focus_cycler_.reset(new internal::FocusCycler()); 781 focus_cycler_.reset(new internal::FocusCycler());
782 782
783 screen_position_controller_.reset(new internal::ScreenPositionController); 783 screen_position_controller_.reset(new internal::ScreenPositionController);
784 root_window_host_factory_.reset(delegate_->CreateRootWindowHostFactory()); 784 root_window_host_factory_.reset(delegate_->CreateWindowTreeHostFactory());
785 785
786 display_controller_->Start(); 786 display_controller_->Start();
787 display_controller_->InitPrimaryDisplay(); 787 display_controller_->InitPrimaryDisplay();
788 aura::Window* root_window = display_controller_->GetPrimaryRootWindow(); 788 aura::Window* root_window = display_controller_->GetPrimaryRootWindow();
789 target_root_window_ = root_window; 789 target_root_window_ = root_window;
790 790
791 resolution_notification_controller_.reset( 791 resolution_notification_controller_.reset(
792 new internal::ResolutionNotificationController); 792 new internal::ResolutionNotificationController);
793 793
794 cursor_manager_.SetDisplay(DisplayController::GetPrimaryDisplay()); 794 cursor_manager_.SetDisplay(DisplayController::GetPrimaryDisplay());
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 //////////////////////////////////////////////////////////////////////////////// 1031 ////////////////////////////////////////////////////////////////////////////////
1032 // Shell, aura::client::ActivationChangeObserver implementation: 1032 // Shell, aura::client::ActivationChangeObserver implementation:
1033 1033
1034 void Shell::OnWindowActivated(aura::Window* gained_active, 1034 void Shell::OnWindowActivated(aura::Window* gained_active,
1035 aura::Window* lost_active) { 1035 aura::Window* lost_active) {
1036 if (gained_active) 1036 if (gained_active)
1037 target_root_window_ = gained_active->GetRootWindow(); 1037 target_root_window_ = gained_active->GetRootWindow();
1038 } 1038 }
1039 1039
1040 } // namespace ash 1040 } // 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