| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/window.h" | 5 #include "ui/aura/window.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 | 134 |
| 135 gfx::Rect Window::GetScreenBounds() const { | 135 gfx::Rect Window::GetScreenBounds() const { |
| 136 const gfx::Rect local_bounds = bounds(); | 136 const gfx::Rect local_bounds = bounds(); |
| 137 gfx::Point origin = local_bounds.origin(); | 137 gfx::Point origin = local_bounds.origin(); |
| 138 Window::ConvertPointToWindow(parent_, | 138 Window::ConvertPointToWindow(parent_, |
| 139 aura::Desktop::GetInstance(), | 139 aura::Desktop::GetInstance(), |
| 140 &origin); | 140 &origin); |
| 141 return gfx::Rect(origin, local_bounds.size()); | 141 return gfx::Rect(origin, local_bounds.size()); |
| 142 } | 142 } |
| 143 | 143 |
| 144 gfx::Point Window::GetPointInScreenCoordinates( |
| 145 const gfx::Point& local_point) { |
| 146 gfx::Point global_point = local_point; |
| 147 Window::ConvertPointToWindow( |
| 148 this, aura::Desktop::GetInstance(), &global_point); |
| 149 return global_point; |
| 150 } |
| 151 |
| 144 void Window::Activate() { | 152 void Window::Activate() { |
| 145 // If we support minimization need to ensure this restores the window first. | 153 // If we support minimization need to ensure this restores the window first. |
| 146 aura::Desktop::GetInstance()->SetActiveWindow(this, this); | 154 aura::Desktop::GetInstance()->SetActiveWindow(this, this); |
| 147 } | 155 } |
| 148 | 156 |
| 149 void Window::Deactivate() { | 157 void Window::Deactivate() { |
| 150 aura::Desktop::GetInstance()->Deactivate(this); | 158 aura::Desktop::GetInstance()->Deactivate(this); |
| 151 } | 159 } |
| 152 | 160 |
| 153 bool Window::IsActive() const { | 161 bool Window::IsActive() const { |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 } | 546 } |
| 539 | 547 |
| 540 void Window::OnPaintLayer(gfx::Canvas* canvas) { | 548 void Window::OnPaintLayer(gfx::Canvas* canvas) { |
| 541 delegate_->OnPaint(canvas); | 549 delegate_->OnPaint(canvas); |
| 542 } | 550 } |
| 543 | 551 |
| 544 void Window::OnLayerAnimationEnded(const ui::Animation* animation) { | 552 void Window::OnLayerAnimationEnded(const ui::Animation* animation) { |
| 545 } | 553 } |
| 546 | 554 |
| 547 } // namespace aura | 555 } // namespace aura |
| OLD | NEW |