| 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 "ui/aura/root_window.h" | 5 #include "ui/aura/root_window.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 window->ContainsPointInRoot(GetLastMouseLocationInRoot()))) { | 325 window->ContainsPointInRoot(GetLastMouseLocationInRoot()))) { |
| 326 PostMouseMoveEventAfterWindowChange(); | 326 PostMouseMoveEventAfterWindowChange(); |
| 327 } | 327 } |
| 328 } | 328 } |
| 329 | 329 |
| 330 void RootWindow::OnKeyboardMappingChanged() { | 330 void RootWindow::OnKeyboardMappingChanged() { |
| 331 FOR_EACH_OBSERVER(RootWindowObserver, observers_, | 331 FOR_EACH_OBSERVER(RootWindowObserver, observers_, |
| 332 OnKeyboardMappingChanged(this)); | 332 OnKeyboardMappingChanged(this)); |
| 333 } | 333 } |
| 334 | 334 |
| 335 void RootWindow::OnRootWindowHostClosed() { | 335 void RootWindow::OnRootWindowHostCloseRequested() { |
| 336 FOR_EACH_OBSERVER(RootWindowObserver, observers_, | 336 FOR_EACH_OBSERVER(RootWindowObserver, observers_, |
| 337 OnRootWindowHostClosed(this)); | 337 OnRootWindowHostCloseRequested(this)); |
| 338 } | 338 } |
| 339 | 339 |
| 340 void RootWindow::AddRootWindowObserver(RootWindowObserver* observer) { | 340 void RootWindow::AddRootWindowObserver(RootWindowObserver* observer) { |
| 341 observers_.AddObserver(observer); | 341 observers_.AddObserver(observer); |
| 342 } | 342 } |
| 343 | 343 |
| 344 void RootWindow::RemoveRootWindowObserver(RootWindowObserver* observer) { | 344 void RootWindow::RemoveRootWindowObserver(RootWindowObserver* observer) { |
| 345 observers_.RemoveObserver(observer); | 345 observers_.RemoveObserver(observer); |
| 346 } | 346 } |
| 347 | 347 |
| (...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1053 void RootWindow::UnlockCompositor() { | 1053 void RootWindow::UnlockCompositor() { |
| 1054 DCHECK(compositor_lock_); | 1054 DCHECK(compositor_lock_); |
| 1055 compositor_lock_ = NULL; | 1055 compositor_lock_ = NULL; |
| 1056 if (draw_on_compositor_unlock_) { | 1056 if (draw_on_compositor_unlock_) { |
| 1057 draw_on_compositor_unlock_ = false; | 1057 draw_on_compositor_unlock_ = false; |
| 1058 ScheduleDraw(); | 1058 ScheduleDraw(); |
| 1059 } | 1059 } |
| 1060 } | 1060 } |
| 1061 | 1061 |
| 1062 } // namespace aura | 1062 } // namespace aura |
| OLD | NEW |