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

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

Issue 8417008: aura: Add fullscreen/popups to RenderWidgetHostViewAura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month 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 | « ui/gfx/compositor/layer.cc ('k') | views/widget/native_widget_aura.cc » ('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 (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 "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; 133 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE;
134 virtual bool ShouldActivate(aura::Event* event) OVERRIDE; 134 virtual bool ShouldActivate(aura::Event* event) OVERRIDE;
135 virtual void OnActivated() OVERRIDE; 135 virtual void OnActivated() OVERRIDE;
136 virtual void OnLostActive() OVERRIDE; 136 virtual void OnLostActive() OVERRIDE;
137 virtual void OnCaptureLost() OVERRIDE; 137 virtual void OnCaptureLost() OVERRIDE;
138 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 138 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
139 virtual void OnWindowDestroying() OVERRIDE; 139 virtual void OnWindowDestroying() OVERRIDE;
140 virtual void OnWindowDestroyed() OVERRIDE; 140 virtual void OnWindowDestroyed() OVERRIDE;
141 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE; 141 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
142 142
143 // ViewProp key for window type. The prop value is one of
144 // Widget::InitParams::Type.
145 static const char* const kWindowTypeKey;
146
147 private: 143 private:
148 internal::NativeWidgetDelegate* delegate_; 144 internal::NativeWidgetDelegate* delegate_;
149 145
150 aura::Window* window_; 146 aura::Window* window_;
151 147
152 // See class documentation for Widget in widget.h for a note about ownership. 148 // See class documentation for Widget in widget.h for a note about ownership.
153 Widget::InitParams::Ownership ownership_; 149 Widget::InitParams::Ownership ownership_;
154 150
155 // The following factory is used for calls to close the NativeWidgetAura 151 // The following factory is used for calls to close the NativeWidgetAura
156 // instance. 152 // instance.
157 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_; 153 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
158 154
159 bool can_activate_; 155 bool can_activate_;
160 156
161 gfx::NativeCursor cursor_; 157 gfx::NativeCursor cursor_;
162 158
163 scoped_ptr<TooltipManagerViews> tooltip_manager_; 159 scoped_ptr<TooltipManagerViews> tooltip_manager_;
164 160
165 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 161 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
166 }; 162 };
167 163
168 } // namespace views 164 } // namespace views
169 165
170 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 166 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/gfx/compositor/layer.cc ('k') | views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698