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

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

Issue 8432020: aura: Work around RenderWidgetHostTest.Background segfault. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 12 matching lines...) Expand all
23 23
24 class RenderWidgetHostViewAura : public RenderWidgetHostView, 24 class RenderWidgetHostViewAura : public RenderWidgetHostView,
25 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) 25 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
26 public ui::CompositorObserver, 26 public ui::CompositorObserver,
27 #endif 27 #endif
28 public aura::WindowDelegate { 28 public aura::WindowDelegate {
29 public: 29 public:
30 explicit RenderWidgetHostViewAura(RenderWidgetHost* host); 30 explicit RenderWidgetHostViewAura(RenderWidgetHost* host);
31 virtual ~RenderWidgetHostViewAura(); 31 virtual ~RenderWidgetHostViewAura();
32 32
33 void Init(); 33 // TODO(derat): Add an abstract RenderWidgetHostView::InitAsChild() method and
34 // update callers: http://crbug.com/102450.
35 void InitAsChild();
34 36
35 // Overridden from RenderWidgetHostView: 37 // Overridden from RenderWidgetHostView:
36 virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, 38 virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
37 const gfx::Rect& pos) OVERRIDE; 39 const gfx::Rect& pos) OVERRIDE;
38 virtual void InitAsFullscreen( 40 virtual void InitAsFullscreen(
39 RenderWidgetHostView* reference_host_view) OVERRIDE; 41 RenderWidgetHostView* reference_host_view) OVERRIDE;
40 virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE; 42 virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
41 virtual void DidBecomeSelected() OVERRIDE; 43 virtual void DidBecomeSelected() OVERRIDE;
42 virtual void WasHidden() OVERRIDE; 44 virtual void WasHidden() OVERRIDE;
43 virtual void SetSize(const gfx::Size& size) OVERRIDE; 45 virtual void SetSize(const gfx::Size& size) OVERRIDE;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_; 158 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_;
157 159
158 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > 160 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> >
159 accelerated_surface_containers_; 161 accelerated_surface_containers_;
160 #endif 162 #endif
161 163
162 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 164 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
163 }; 165 };
164 166
165 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 167 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698