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

Unified Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 11231077: Move a bunch more code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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/web_contents/web_contents_view_aura.h
===================================================================
--- content/browser/web_contents/web_contents_view_aura.h (revision 163514)
+++ content/browser/web_contents/web_contents_view_aura.h (working copy)
@@ -15,29 +15,27 @@
#include "ui/aura/client/drag_drop_delegate.h"
#include "ui/aura/window_delegate.h"
-class WebContentsImpl;
-
namespace aura {
class Window;
}
+namespace ui {
+class DropTargetEvent;
+}
+
namespace content {
class WebContentsViewDelegate;
+class WebContentsImpl;
class WebDragDestDelegate;
-}
-namespace ui {
-class DropTargetEvent;
-}
-
class CONTENT_EXPORT WebContentsViewAura
- : public content::WebContentsView,
- public content::RenderViewHostDelegateView,
+ : public WebContentsView,
+ public RenderViewHostDelegateView,
public aura::WindowDelegate,
public aura::client::DragDropDelegate {
public:
WebContentsViewAura(WebContentsImpl* web_contents,
- content::WebContentsViewDelegate* delegate);
+ WebContentsViewDelegate* delegate);
private:
virtual ~WebContentsViewAura();
@@ -48,8 +46,8 @@
// Overridden from WebContentsView:
virtual void CreateView(const gfx::Size& initial_size) OVERRIDE;
- virtual content::RenderWidgetHostView* CreateViewForWidget(
- content::RenderWidgetHost* render_widget_host) OVERRIDE;
+ virtual RenderWidgetHostView* CreateViewForWidget(
+ RenderWidgetHost* render_widget_host) OVERRIDE;
virtual gfx::NativeView GetNativeView() const OVERRIDE;
virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
@@ -58,7 +56,7 @@
virtual void OnTabCrashed(base::TerminationStatus status,
int error_code) OVERRIDE;
virtual void SizeContents(const gfx::Size& size) OVERRIDE;
- virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE;
+ virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
virtual void Focus() OVERRIDE;
virtual void SetInitialFocus() OVERRIDE;
virtual void StoreFocus() OVERRIDE;
@@ -70,8 +68,8 @@
// Overridden from RenderViewHostDelegateView:
virtual void ShowContextMenu(
- const content::ContextMenuParams& params,
- content::ContextMenuSourceType type) OVERRIDE;
+ const ContextMenuParams& params,
+ ContextMenuSourceType type) OVERRIDE;
virtual void ShowPopupMenu(const gfx::Rect& bounds,
int item_height,
double item_font_size,
@@ -126,13 +124,13 @@
// The WebContentsImpl whose contents we display.
WebContentsImpl* web_contents_;
- content::RenderWidgetHostView* view_;
+ RenderWidgetHostView* view_;
- scoped_ptr<content::WebContentsViewDelegate> delegate_;
+ scoped_ptr<WebContentsViewDelegate> delegate_;
WebKit::WebDragOperationsMask current_drag_op_;
- content::WebDragDestDelegate* drag_dest_delegate_;
+ WebDragDestDelegate* drag_dest_delegate_;
// We keep track of the render view host we're dragging over. If it changes
// during a drag, we need to re-send the DragEnter message. WARNING:
@@ -143,4 +141,6 @@
DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
};
+} // namespace content
+
#endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
« no previous file with comments | « content/browser/web_contents/web_contents_view_android.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698