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

Side by Side Diff: views/widget/native_widget_aura.h

Issue 8202026: views: Some more layer change, and add/update some tests for layers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 2 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
OLDNEW
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 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 10
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; 128 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
129 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; 129 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
130 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; 130 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE;
131 virtual bool ShouldActivate(aura::MouseEvent* event) OVERRIDE; 131 virtual bool ShouldActivate(aura::MouseEvent* event) OVERRIDE;
132 virtual void OnActivated() OVERRIDE; 132 virtual void OnActivated() OVERRIDE;
133 virtual void OnLostActive() OVERRIDE; 133 virtual void OnLostActive() OVERRIDE;
134 virtual void OnCaptureLost() OVERRIDE; 134 virtual void OnCaptureLost() OVERRIDE;
135 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 135 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
136 virtual void OnWindowDestroying() OVERRIDE; 136 virtual void OnWindowDestroying() OVERRIDE;
137 virtual void OnWindowDestroyed() OVERRIDE; 137 virtual void OnWindowDestroyed() OVERRIDE;
138 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
138 139
139 private: 140 private:
140 typedef std::map<const char*, void*> PropsMap; 141 typedef std::map<const char*, void*> PropsMap;
141 142
142 internal::NativeWidgetDelegate* delegate_; 143 internal::NativeWidgetDelegate* delegate_;
143 144
144 aura::Window* window_; 145 aura::Window* window_;
145 146
146 // See class documentation for Widget in widget.h for a note about ownership. 147 // See class documentation for Widget in widget.h for a note about ownership.
147 Widget::InitParams::Ownership ownership_; 148 Widget::InitParams::Ownership ownership_;
148 149
149 // The following factory is used for calls to close the NativeWidgetAura 150 // The following factory is used for calls to close the NativeWidgetAura
150 // instance. 151 // instance.
151 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_; 152 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
152 153
153 bool can_activate_; 154 bool can_activate_;
154 155
155 // Map used by Set/GetNativeWindowProperty. 156 // Map used by Set/GetNativeWindowProperty.
156 PropsMap props_map_; 157 PropsMap props_map_;
157 158
158 gfx::NativeCursor cursor_; 159 gfx::NativeCursor cursor_;
159 160
160 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 161 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
161 }; 162 };
162 163
163 } // namespace views 164 } // namespace views
164 165
165 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 166 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698