| Index: content/browser/renderer_host/render_widget_host_view_win.h
|
| ===================================================================
|
| --- content/browser/renderer_host/render_widget_host_view_win.h (revision 147462)
|
| +++ content/browser/renderer_host/render_widget_host_view_win.h (working copy)
|
| @@ -32,14 +32,8 @@
|
| #include "ui/surface/accelerated_surface_win.h"
|
| #include "webkit/glue/webcursor.h"
|
|
|
| -class BackingStore;
|
| class SkRegion;
|
| -class WebTouchState;
|
|
|
| -namespace content {
|
| -class RenderWidgetHost;
|
| -}
|
| -
|
| namespace gfx {
|
| class Size;
|
| class Rect;
|
| @@ -53,6 +47,11 @@
|
| class ViewProp;
|
| }
|
|
|
| +namespace content {
|
| +class BackingStore;
|
| +class RenderWidgetHost;
|
| +class WebTouchState;
|
| +
|
| typedef CWinTraits<WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0>
|
| RenderWidgetHostHWNDTraits;
|
|
|
| @@ -78,8 +77,8 @@
|
| : public CWindowImpl<RenderWidgetHostViewWin,
|
| CWindow,
|
| RenderWidgetHostHWNDTraits>,
|
| - public content::RenderWidgetHostViewBase,
|
| - public content::NotificationObserver,
|
| + public RenderWidgetHostViewBase,
|
| + public NotificationObserver,
|
| public BrowserAccessibilityDelegate,
|
| public ui::GestureConsumer,
|
| public ui::GestureEventHelper {
|
| @@ -146,7 +145,7 @@
|
|
|
| // RenderWidgetHostView implementation.
|
| virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
|
| - virtual content::RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
|
| + virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
|
| virtual void SetSize(const gfx::Size& size) OVERRIDE;
|
| virtual void SetBounds(const gfx::Rect& rect) OVERRIDE;
|
| virtual gfx::NativeView GetNativeView() const OVERRIDE;
|
| @@ -161,10 +160,10 @@
|
| virtual void SetBackground(const SkBitmap& background) OVERRIDE;
|
|
|
| // Implementation of RenderWidgetHostViewPort.
|
| - virtual void InitAsPopup(content::RenderWidgetHostView* parent_host_view,
|
| + virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
|
| const gfx::Rect& pos) OVERRIDE;
|
| virtual void InitAsFullscreen(
|
| - content::RenderWidgetHostView* reference_host_view) OVERRIDE;
|
| + RenderWidgetHostView* reference_host_view) OVERRIDE;
|
| virtual void WasRestored() OVERRIDE;
|
| virtual void WasHidden() OVERRIDE;
|
| virtual void MovePluginWindows(
|
| @@ -218,10 +217,10 @@
|
| virtual void UnlockMouse() OVERRIDE;
|
| virtual void SetClickthroughRegion(SkRegion* region) OVERRIDE;
|
|
|
| - // Implementation of content::NotificationObserver:
|
| + // Implementation of NotificationObserver:
|
| virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| + const NotificationSource& source,
|
| + const NotificationDetails& details) OVERRIDE;
|
|
|
| // Implementation of BrowserAccessibilityDelegate:
|
| virtual void SetAccessibilityFocus(int acc_obj_id) OVERRIDE;
|
| @@ -251,12 +250,12 @@
|
| virtual bool DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
|
|
|
| protected:
|
| - friend class content::RenderWidgetHostView;
|
| + friend class RenderWidgetHostView;
|
|
|
| // Should construct only via RenderWidgetHostView::CreateViewForWidget.
|
| //
|
| // The view will associate itself with the given widget.
|
| - explicit RenderWidgetHostViewWin(content::RenderWidgetHost* widget);
|
| + explicit RenderWidgetHostViewWin(RenderWidgetHost* widget);
|
|
|
| // Windows Message Handlers
|
| LRESULT OnCreate(CREATESTRUCT* create_struct);
|
| @@ -407,7 +406,7 @@
|
| // The associated Model. While |this| is being Destroyed,
|
| // |render_widget_host_| is NULL and the Windows message loop is run one last
|
| // time. Message handlers must check for a NULL |render_widget_host_|.
|
| - content::RenderWidgetHostImpl* render_widget_host_;
|
| + RenderWidgetHostImpl* render_widget_host_;
|
|
|
| // When we are doing accelerated compositing
|
| HWND compositor_host_window_;
|
| @@ -485,7 +484,7 @@
|
| base::TimeTicks web_contents_switch_paint_time_;
|
|
|
| // Registrar so we can listen to RENDERER_PROCESS_TERMINATED events.
|
| - content::NotificationRegistrar registrar_;
|
| + NotificationRegistrar registrar_;
|
|
|
| // Stores the current text input type received by TextInputStateChanged()
|
| // method.
|
| @@ -557,4 +556,6 @@
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
|
| };
|
|
|
| +} // namespace content
|
| +
|
| #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
|
|
|