Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Side by Side Diff: mojo/services/view_manager/node.cc

Issue 418983002: Nukes view_manager namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve merge Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « mojo/services/view_manager/node.h ('k') | mojo/services/view_manager/node_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "mojo/services/view_manager/view.h" 8 #include "mojo/services/view_manager/view.h"
9 #include "ui/aura/window_property.h" 9 #include "ui/aura/window_property.h"
10 #include "ui/base/cursor/cursor.h" 10 #include "ui/base/cursor/cursor.h"
11 #include "ui/base/hit_test.h" 11 #include "ui/base/hit_test.h"
12 #include "ui/gfx/canvas.h" 12 #include "ui/gfx/canvas.h"
13 #include "ui/gfx/image/image_skia.h" 13 #include "ui/gfx/image/image_skia.h"
14 #include "ui/gfx/native_widget_types.h" 14 #include "ui/gfx/native_widget_types.h"
15 15
16 DECLARE_WINDOW_PROPERTY_TYPE(mojo::view_manager::service::Node*); 16 DECLARE_WINDOW_PROPERTY_TYPE(mojo::service::Node*);
17 17
18 namespace mojo { 18 namespace mojo {
19 namespace view_manager {
20 namespace service { 19 namespace service {
21 20
22 DEFINE_WINDOW_PROPERTY_KEY(Node*, kNodeKey, NULL); 21 DEFINE_WINDOW_PROPERTY_KEY(Node*, kNodeKey, NULL);
23 22
24 Node::Node(NodeDelegate* delegate, const NodeId& id) 23 Node::Node(NodeDelegate* delegate, const NodeId& id)
25 : delegate_(delegate), 24 : delegate_(delegate),
26 id_(id), 25 id_(id),
27 view_(NULL), 26 view_(NULL),
28 window_(this) { 27 window_(this) {
29 DCHECK(delegate); // Must provide a delegate. 28 DCHECK(delegate); // Must provide a delegate.
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 205
207 void Node::GetHitTestMask(gfx::Path* mask) const { 206 void Node::GetHitTestMask(gfx::Path* mask) const {
208 } 207 }
209 208
210 void Node::OnEvent(ui::Event* event) { 209 void Node::OnEvent(ui::Event* event) {
211 if (view_) 210 if (view_)
212 delegate_->OnViewInputEvent(view_, event); 211 delegate_->OnViewInputEvent(view_, event);
213 } 212 }
214 213
215 } // namespace service 214 } // namespace service
216 } // namespace view_manager
217 } // namespace mojo 215 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/services/view_manager/node.h ('k') | mojo/services/view_manager/node_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698