trunk/src/mojo/services/view_manager/node.h - Issue 304323005: Revert 273723 "Wire input events through the ViewManagerClient i..."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: trunk/src/mojo/services/view_manager/node.h

Issue 304323005: Revert 273723 "Wire input events through the ViewManagerClient i..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 6 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

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 #ifndef MOJO_SERVICES_VIEW_MANAGER_NODE_H_	5 #ifndef MOJO_SERVICES_VIEW_MANAGER_NODE_H_

6 #define MOJO_SERVICES_VIEW_MANAGER_NODE_H_	6 #define MOJO_SERVICES_VIEW_MANAGER_NODE_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/logging.h"	10 #include "base/logging.h"

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 virtual bool CanFocus() OVERRIDE;	79 virtual bool CanFocus() OVERRIDE;

80 virtual void OnCaptureLost() OVERRIDE;	80 virtual void OnCaptureLost() OVERRIDE;

81 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;	81 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;

82 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;	82 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;

83 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;	83 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;

84 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;	84 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;

85 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;	85 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;

86 virtual bool HasHitTestMask() const OVERRIDE;	86 virtual bool HasHitTestMask() const OVERRIDE;

87 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;	87 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;

88	88

89 // ui::EventHandler overrides:

90 virtual void OnEvent(ui::Event* event) OVERRIDE;

91

92 NodeDelegate* delegate_;	89 NodeDelegate* delegate_;

93 const NodeId id_;	90 const NodeId id_;

94	91

95 // Weak pointer to view associated with this node.	92 // Weak pointer to view associated with this node.

96 View* view_;	93 View* view_;

97	94

98 ViewId view_id_;	95 ViewId view_id_;

99	96

100 aura::Window window_;	97 aura::Window window_;

101	98

102 DISALLOW_COPY_AND_ASSIGN(Node);	99 DISALLOW_COPY_AND_ASSIGN(Node);

103 };	100 };

104	101

105 } // namespace service	102 } // namespace service

106 } // namespace view_manager	103 } // namespace view_manager

107 } // namespace mojo	104 } // namespace mojo

108	105

109 #endif // MOJO_SERVICES_VIEW_MANAGER_NODE_H_	106 #endif // MOJO_SERVICES_VIEW_MANAGER_NODE_H_

OLD	NEW