Chromium Code Reviews Chromium Code Reviews
Issue 11519040:
More unittests passing with new focus controller. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/| OLD | NEW |
|---|---|
| 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/focus_manager_factory.h" | 10 #include "ash/accelerators/focus_manager_factory.h" |
| (...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 891 } | 891 } |
| 892 | 892 |
| 893 void Shell::OnEvent(ui::Event* event) { | 893 void Shell::OnEvent(ui::Event* event) { |
| 894 } | 894 } |
| 895 | 895 |
| 896 //////////////////////////////////////////////////////////////////////////////// | 896 //////////////////////////////////////////////////////////////////////////////// |
| 897 // Shell, aura::client::ActivationChangeObserver implementation: | 897 // Shell, aura::client::ActivationChangeObserver implementation: |
| 898 | 898 |
| 899 void Shell::OnWindowActivated(aura::Window* gained_active, | 899 void Shell::OnWindowActivated(aura::Window* gained_active, |
| 900 aura::Window* lost_active) { | 900 aura::Window* lost_active) { |
| 901 active_root_window_ = gained_active->GetRootWindow(); | 901 if (gained_active) |
|
sky
2012/12/13 21:38:06
Does this need to set active_root_window_ to NULL
| |
| 902 active_root_window_ = gained_active->GetRootWindow(); | |
| 902 } | 903 } |
| 903 | 904 |
| 904 } // namespace ash | 905 } // namespace ash |
| OLD | NEW |
