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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_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 | « no previous file | content/browser/renderer_host/render_widget_host_view_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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 10
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; 125 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE;
126 #endif 126 #endif
127 127
128 void UpdateCursorIfOverSelf(); 128 void UpdateCursorIfOverSelf();
129 129
130 // The model object. 130 // The model object.
131 RenderWidgetHost* host_; 131 RenderWidgetHost* host_;
132 132
133 aura::Window* window_; 133 aura::Window* window_;
134 134
135 // Is this a fullscreen view?
136 bool is_fullscreen_;
137
138 // Our parent host view, if this is a popup. NULL otherwise.
139 RenderWidgetHostViewAura* popup_parent_host_view_;
140
135 // True when content is being loaded. Used to show an hourglass cursor. 141 // True when content is being loaded. Used to show an hourglass cursor.
136 bool is_loading_; 142 bool is_loading_;
137 143
138 // The cursor for the page. This is passed up from the renderer. 144 // The cursor for the page. This is passed up from the renderer.
139 WebCursor current_cursor_; 145 WebCursor current_cursor_;
140 146
141 // The touch-event. Its touch-points are updated as necessary. A new 147 // The touch-event. Its touch-points are updated as necessary. A new
142 // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is 148 // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is
143 // removed from the list on an ET_TOUCH_RELEASED event. 149 // removed from the list on an ET_TOUCH_RELEASED event.
144 WebKit::WebTouchEvent touch_event_; 150 WebKit::WebTouchEvent touch_event_;
145 151
146 // Current tooltip text. 152 // Current tooltip text.
147 string16 tooltip_; 153 string16 tooltip_;
148 154
149 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) 155 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
150 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_; 156 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_;
151 157
152 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > 158 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> >
153 accelerated_surface_containers_; 159 accelerated_surface_containers_;
154 #endif 160 #endif
155 161
156 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 162 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
157 }; 163 };
158 164
159 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 165 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698