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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 10454107: Revert 139494 - ash: Improved window maximize/restore animations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include <vector> 10 #include <vector>
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 // Should construct only via RenderWidgetHostView::CreateViewForWidget. 178 // Should construct only via RenderWidgetHostView::CreateViewForWidget.
179 explicit RenderWidgetHostViewAura(content::RenderWidgetHost* host); 179 explicit RenderWidgetHostViewAura(content::RenderWidgetHost* host);
180 180
181 private: 181 private:
182 class WindowObserver; 182 class WindowObserver;
183 friend class WindowObserver; 183 friend class WindowObserver;
184 184
185 // Overridden from ui::CompositorObserver: 185 // Overridden from ui::CompositorObserver:
186 virtual void OnCompositingStarted(ui::Compositor* compositor) OVERRIDE; 186 virtual void OnCompositingStarted(ui::Compositor* compositor) OVERRIDE;
187 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; 187 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE;
188 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE;
189 188
190 // Overridden from ImageTransportFactoryObserver: 189 // Overridden from ImageTransportFactoryObserver:
191 virtual void OnLostResources(ui::Compositor* compositor) OVERRIDE; 190 virtual void OnLostResources(ui::Compositor* compositor) OVERRIDE;
192 191
193 void UpdateCursorIfOverSelf(); 192 void UpdateCursorIfOverSelf();
194 void UpdateExternalTexture(); 193 void UpdateExternalTexture();
195 ui::InputMethod* GetInputMethod() const; 194 ui::InputMethod* GetInputMethod() const;
196 195
197 // Returns whether the widget needs an input grab to work properly. 196 // Returns whether the widget needs an input grab to work properly.
198 bool NeedsInputGrab(); 197 bool NeedsInputGrab();
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 // These locks are the ones waiting for a texture of the right size to come 302 // These locks are the ones waiting for a texture of the right size to come
304 // back from the renderer/GPU process. 303 // back from the renderer/GPU process.
305 std::vector<linked_ptr<ResizeLock> > resize_locks_; 304 std::vector<linked_ptr<ResizeLock> > resize_locks_;
306 // These locks are the ones waiting for a frame to be drawn. 305 // These locks are the ones waiting for a frame to be drawn.
307 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; 306 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_;
308 307
309 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 308 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
310 }; 309 };
311 310
312 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 311 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_manager_unittest.cc ('k') | 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