| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 return false; | 105 return false; |
| 106 } | 106 } |
| 107 } | 107 } |
| 108 return BaseFocusRules::CanActivateWindow(window); | 108 return BaseFocusRules::CanActivateWindow(window); |
| 109 } | 109 } |
| 110 | 110 |
| 111 virtual aura::Window* GetNextActivatableWindow( | 111 virtual aura::Window* GetNextActivatableWindow( |
| 112 aura::Window* ignore) const override { | 112 aura::Window* ignore) const override { |
| 113 aura::Window* next = wm::BaseFocusRules::GetNextActivatableWindow(ignore); | 113 aura::Window* next = wm::BaseFocusRules::GetNextActivatableWindow(ignore); |
| 114 // TODO(oshima): Search from activatable containers if |next| is NULL. | 114 // TODO(oshima): Search from activatable containers if |next| is NULL. |
| 115 // crbug.com/424750. |
| 115 return next; | 116 return next; |
| 116 } | 117 } |
| 117 | 118 |
| 118 private: | 119 private: |
| 119 DISALLOW_COPY_AND_ASSIGN(AthenaFocusRules); | 120 DISALLOW_COPY_AND_ASSIGN(AthenaFocusRules); |
| 120 }; | 121 }; |
| 121 | 122 |
| 122 class AthenaScreenPositionClient : public aura::client::ScreenPositionClient { | 123 class AthenaScreenPositionClient : public aura::client::ScreenPositionClient { |
| 123 public: | 124 public: |
| 124 AthenaScreenPositionClient() { | 125 AthenaScreenPositionClient() { |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 } | 396 } |
| 396 | 397 |
| 397 // static | 398 // static |
| 398 void ScreenManager::Shutdown() { | 399 void ScreenManager::Shutdown() { |
| 399 DCHECK(instance); | 400 DCHECK(instance); |
| 400 delete instance; | 401 delete instance; |
| 401 DCHECK(!instance); | 402 DCHECK(!instance); |
| 402 } | 403 } |
| 403 | 404 |
| 404 } // namespace athena | 405 } // namespace athena |
| OLD | NEW |