1 files changed, 9 insertions, 6 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h
index 9fbaf11..5d8c680 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.h
@@ -15,6 +15,7 @@
 
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_ptr.h"
+#include "base/scoped_vector.h"
 #include "base/task.h"
 #include "chrome/browser/accessibility/browser_accessibility_manager.h"
 #include "chrome/browser/ime_input.h"
@@ -23,6 +24,12 @@
 #include "chrome/common/notification_registrar.h"
 #include "webkit/glue/webcursor.h"
 
+namespace app {
+namespace win {
+class ScopedProp;
+}
+}
+
 namespace gfx {
 class Size;
 class Rect;
@@ -34,7 +41,6 @@ class Message;
 
 class BackingStore;
 class RenderWidgetHost;
-class GpuViewHost;
 
 typedef CWinTraits<WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0>
     RenderWidgetHostHWNDTraits;
@@ -149,7 +155,6 @@ class RenderWidgetHostViewWin
   virtual void Destroy();
   virtual void SetTooltipText(const std::wstring& tooltip_text);
   virtual BackingStore* AllocBackingStore(const gfx::Size& size);
-  virtual VideoLayer* AllocVideoLayer(const gfx::Size& size);
   virtual void SetBackground(const SkBitmap& background);
   virtual bool ContainsNativeView(gfx::NativeView native_view) const;
   virtual void SetVisuallyDeemphasized(bool deemphasized);
@@ -261,10 +266,6 @@ class RenderWidgetHostViewWin
   // The associated Model.
   RenderWidgetHost* render_widget_host_;
 
-  // If we're doing out-of-process painting, this member will be non-NULL,
-  // indicating the gpu view we're using for the painting.
-  scoped_ptr<GpuViewHost> gpu_view_host_;
-
   // The cursor for the page. This is passed up from the renderer.
   WebCursor current_cursor_;
 
@@ -343,6 +344,8 @@ class RenderWidgetHostViewWin
   // method.
   WebKit::WebTextInputType text_input_type_;
 
+  ScopedVector<app::win::ScopedProp> props_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
 };