| 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 "aura/window.h" | 5 #include "ui/aura/window.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "aura/desktop.h" | |
| 10 #include "aura/event.h" | |
| 11 #include "aura/window_delegate.h" | |
| 12 #include "aura/window_manager.h" | |
| 13 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "ui/aura/desktop.h" |
| 11 #include "ui/aura/event.h" |
| 12 #include "ui/aura/window_delegate.h" |
| 13 #include "ui/aura/window_manager.h" |
| 14 #include "ui/gfx/canvas_skia.h" | 14 #include "ui/gfx/canvas_skia.h" |
| 15 #include "ui/gfx/compositor/compositor.h" | 15 #include "ui/gfx/compositor/compositor.h" |
| 16 #include "ui/gfx/compositor/layer.h" | 16 #include "ui/gfx/compositor/layer.h" |
| 17 | 17 |
| 18 namespace aura { | 18 namespace aura { |
| 19 | 19 |
| 20 Window::Window(WindowDelegate* delegate) | 20 Window::Window(WindowDelegate* delegate) |
| 21 : delegate_(delegate), | 21 : delegate_(delegate), |
| 22 visibility_(VISIBILITY_HIDDEN), | 22 visibility_(VISIBILITY_HIDDEN), |
| 23 parent_(NULL), | 23 parent_(NULL), |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 void Window::SchedulePaint() { | 166 void Window::SchedulePaint() { |
| 167 SchedulePaintInRect(gfx::Rect(0, 0, bounds_.width(), bounds_.height())); | 167 SchedulePaintInRect(gfx::Rect(0, 0, bounds_.width(), bounds_.height())); |
| 168 } | 168 } |
| 169 | 169 |
| 170 void Window::OnPaintLayer(gfx::Canvas* canvas) { | 170 void Window::OnPaintLayer(gfx::Canvas* canvas) { |
| 171 if (delegate_) | 171 if (delegate_) |
| 172 delegate_->OnPaint(canvas); | 172 delegate_->OnPaint(canvas); |
| 173 } | 173 } |
| 174 | 174 |
| 175 } // namespace aura | 175 } // namespace aura |
| OLD | NEW |
|---|
Chromium Code Reviews
