| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/services/view_manager/node.h" | 5 #include "mojo/services/view_manager/node.h" |
| 6 | 6 |
| 7 #include "mojo/services/view_manager/node_delegate.h" | 7 #include "mojo/services/view_manager/node_delegate.h" |
| 8 #include "ui/aura/window_property.h" | 8 #include "ui/aura/window_property.h" |
| 9 #include "ui/base/cursor/cursor.h" | 9 #include "ui/base/cursor/cursor.h" |
| 10 #include "ui/base/hit_test.h" | 10 #include "ui/base/hit_test.h" |
| 11 #include "ui/compositor/layer.h" |
| 11 #include "ui/gfx/canvas.h" | 12 #include "ui/gfx/canvas.h" |
| 12 #include "ui/gfx/image/image_skia.h" | 13 #include "ui/gfx/image/image_skia.h" |
| 13 #include "ui/gfx/native_widget_types.h" | 14 #include "ui/gfx/native_widget_types.h" |
| 14 | 15 |
| 15 DECLARE_WINDOW_PROPERTY_TYPE(mojo::service::Node*); | 16 DECLARE_WINDOW_PROPERTY_TYPE(mojo::service::Node*); |
| 16 | 17 |
| 17 namespace mojo { | 18 namespace mojo { |
| 18 namespace service { | 19 namespace service { |
| 19 | 20 |
| 20 DEFINE_WINDOW_PROPERTY_KEY(Node*, kNodeKey, NULL); | 21 DEFINE_WINDOW_PROPERTY_KEY(Node*, kNodeKey, NULL); |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 | 180 |
| 180 bool Node::HasHitTestMask() const { | 181 bool Node::HasHitTestMask() const { |
| 181 return false; | 182 return false; |
| 182 } | 183 } |
| 183 | 184 |
| 184 void Node::GetHitTestMask(gfx::Path* mask) const { | 185 void Node::GetHitTestMask(gfx::Path* mask) const { |
| 185 } | 186 } |
| 186 | 187 |
| 187 } // namespace service | 188 } // namespace service |
| 188 } // namespace mojo | 189 } // namespace mojo |
| OLD | NEW |