Chromium Code Reviews| 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" |
| 11 #include "ui/aura/desktop.h" | 11 #include "ui/aura/desktop.h" |
| 12 #include "ui/aura/desktop_delegate.h" | 12 #include "ui/aura/desktop_delegate.h" |
| 13 #include "ui/aura/event.h" | 13 #include "ui/aura/event.h" |
| 14 #include "ui/aura/event_filter.h" | 14 #include "ui/aura/event_filter.h" |
| 15 #include "ui/aura/layout_manager.h" | 15 #include "ui/aura/layout_manager.h" |
| 16 #include "ui/aura/window_delegate.h" | 16 #include "ui/aura/window_delegate.h" |
| 17 #include "ui/aura/window_observer.h" | 17 #include "ui/aura/window_observer.h" |
| 18 #include "ui/aura/window_types.h" | 18 #include "ui/aura/window_types.h" |
| 19 #include "ui/base/animation/multi_animation.h" | 19 #include "ui/base/animation/multi_animation.h" |
| 20 #include "ui/base/view_prop.h" | 20 #include "ui/base/view_prop.h" |
| 21 #include "ui/gfx/canvas_skia.h" | 21 #include "ui/gfx/canvas_skia.h" |
| 22 #include "ui/gfx/compositor/compositor.h" | 22 #include "ui/gfx/compositor/compositor.h" |
| 23 #include "ui/gfx/screen.h" | 23 #include "ui/gfx/screen.h" |
| 24 | 24 |
| 25 namespace aura { | 25 namespace aura { |
| 26 | 26 |
| 27 // static | |
| 28 const char Window::kPropAlwaysOnTop[] = "AlwaysOnTop"; | |
|
oshima
2011/11/01 18:35:21
move this to ui/aura/aura_constants.cc
xiyuan
2011/11/02 23:26:32
Done.
| |
| 29 | |
| 27 Window::Window(WindowDelegate* delegate) | 30 Window::Window(WindowDelegate* delegate) |
| 28 : type_(kWindowType_None), | 31 : type_(kWindowType_None), |
| 29 delegate_(delegate), | 32 delegate_(delegate), |
| 30 show_state_(ui::SHOW_STATE_NORMAL), | 33 show_state_(ui::SHOW_STATE_NORMAL), |
| 31 parent_(NULL), | 34 parent_(NULL), |
| 32 transient_parent_(NULL), | 35 transient_parent_(NULL), |
| 33 id_(-1), | 36 id_(-1), |
| 34 user_data_(NULL), | 37 user_data_(NULL), |
| 35 stops_event_propagation_(false) { | 38 stops_event_propagation_(false) { |
| 36 } | 39 } |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 532 | 535 |
| 533 void Window::OnPaintLayer(gfx::Canvas* canvas) { | 536 void Window::OnPaintLayer(gfx::Canvas* canvas) { |
| 534 delegate_->OnPaint(canvas); | 537 delegate_->OnPaint(canvas); |
| 535 } | 538 } |
| 536 | 539 |
| 537 void Window::OnLayerAnimationEnded( | 540 void Window::OnLayerAnimationEnded( |
| 538 const ui::LayerAnimationSequence* animation) { | 541 const ui::LayerAnimationSequence* animation) { |
| 539 } | 542 } |
| 540 | 543 |
| 541 } // namespace aura | 544 } // namespace aura |
| OLD | NEW |