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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 10804031: Move more files into the content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_aura.h
===================================================================
--- content/browser/renderer_host/render_widget_host_view_aura.h (revision 147462)
+++ content/browser/renderer_host/render_widget_host_view_aura.h (working copy)
@@ -25,11 +25,6 @@
class CompositorLock;
}
-namespace content {
-class RenderWidgetHostImpl;
-class RenderWidgetHostView;
-}
-
namespace gfx {
class Canvas;
}
@@ -43,9 +38,13 @@
class WebTouchEvent;
}
+namespace content {
+class RenderWidgetHostImpl;
+class RenderWidgetHostView;
+
// RenderWidgetHostView class hierarchy described in render_widget_host_view.h.
class RenderWidgetHostViewAura
- : public content::RenderWidgetHostViewBase,
+ : public RenderWidgetHostViewBase,
public ui::CompositorObserver,
public ui::TextInputClient,
public aura::WindowDelegate,
@@ -54,7 +53,7 @@
public:
// 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;
@@ -69,10 +68,10 @@
virtual void SetBackground(const SkBitmap& background) OVERRIDE;
// Overridden from 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(
@@ -182,10 +181,10 @@
virtual void OnLostActive() OVERRIDE;
protected:
- friend class content::RenderWidgetHostView;
+ friend class RenderWidgetHostView;
// Should construct only via RenderWidgetHostView::CreateViewForWidget.
- explicit RenderWidgetHostViewAura(content::RenderWidgetHost* host);
+ explicit RenderWidgetHostViewAura(RenderWidgetHost* host);
private:
class WindowObserver;
@@ -248,7 +247,7 @@
gfx::Rect ConvertRectToScreen(const gfx::Rect& rect);
// The model object.
- content::RenderWidgetHostImpl* host_;
+ RenderWidgetHostImpl* host_;
aura::Window* window_;
@@ -346,4 +345,6 @@
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
};
+} // namespace content
+
#endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_

Powered by Google App Engine
This is Rietveld 408576698