OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "athena/screen/screen_manager_impl.h" | 5 #include "athena/screen/screen_manager_impl.h" |
6 | 6 |
7 #include "athena/input/public/accelerator_manager.h" | 7 #include "athena/input/public/accelerator_manager.h" |
8 #include "athena/screen/modal_window_controller.h" | 8 #include "athena/screen/modal_window_controller.h" |
9 #include "athena/screen/screen_accelerator_handler.h" | 9 #include "athena/screen/screen_accelerator_handler.h" |
10 #include "athena/util/container_priorities.h" | 10 #include "athena/util/container_priorities.h" |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 wm::FocusController* focus_controller = | 236 wm::FocusController* focus_controller = |
237 new wm::FocusController(new AthenaFocusRules()); | 237 new wm::FocusController(new AthenaFocusRules()); |
238 | 238 |
239 aura::client::SetFocusClient(root_window_, focus_controller); | 239 aura::client::SetFocusClient(root_window_, focus_controller); |
240 root_window_->AddPreTargetHandler(focus_controller); | 240 root_window_->AddPreTargetHandler(focus_controller); |
241 aura::client::SetActivationClient(root_window_, focus_controller); | 241 aura::client::SetActivationClient(root_window_, focus_controller); |
242 focus_client_.reset(focus_controller); | 242 focus_client_.reset(focus_controller); |
243 | 243 |
244 root_window_->SetLayoutManager(new FillLayoutManager(root_window_)); | 244 root_window_->SetLayoutManager(new FillLayoutManager(root_window_)); |
245 capture_client_.reset(new ::wm::ScopedCaptureClient(root_window_)); | 245 capture_client_.reset(new ::wm::ScopedCaptureClient(root_window_)); |
246 accelerator_handler_.reset(new ScreenAcceleratorHandler(root_window_)); | 246 accelerator_handler_.reset(new ScreenAcceleratorHandler()); |
247 | 247 |
248 aura::client::SetWindowTreeClient(root_window_, this); | 248 aura::client::SetWindowTreeClient(root_window_, this); |
249 | 249 |
250 screen_position_client_.reset(new AthenaScreenPositionClient()); | 250 screen_position_client_.reset(new AthenaScreenPositionClient()); |
251 aura::client::SetScreenPositionClient(root_window_, | 251 aura::client::SetScreenPositionClient(root_window_, |
252 screen_position_client_.get()); | 252 screen_position_client_.get()); |
253 root_window_->SetEventTargeter( | 253 root_window_->SetEventTargeter( |
254 make_scoped_ptr(new AthenaWindowTargeter(root_window_))); | 254 make_scoped_ptr(new AthenaWindowTargeter(root_window_))); |
255 } | 255 } |
256 | 256 |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 } | 395 } |
396 | 396 |
397 // static | 397 // static |
398 void ScreenManager::Shutdown() { | 398 void ScreenManager::Shutdown() { |
399 DCHECK(instance); | 399 DCHECK(instance); |
400 delete instance; | 400 delete instance; |
401 DCHECK(!instance); | 401 DCHECK(!instance); |
402 } | 402 } |
403 | 403 |
404 } // namespace athena | 404 } // namespace athena |
OLD | NEW |