TabContents -> WebContentsImpl, part 5.

content/browser/web_contents/web_contents_view_aura.h

Index: content/browser/web_contents/web_contents_view_aura.h
diff --git a/content/browser/tab_contents/tab_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h
similarity index 92%
rename from content/browser/tab_contents/tab_contents_view_aura.h
rename to content/browser/web_contents/web_contents_view_aura.h
index 56b3ba8cba799e64b34ce4d510e3b8de9ec04ea1..360006a9a8ad013553a8251c747a757634b48f10 100644
--- a/content/browser/tab_contents/tab_contents_view_aura.h
+++ b/content/browser/web_contents/web_contents_view_aura.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_AURA_H_
-#define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_AURA_H_
+#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
+#define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/browser/tab_contents/tab_contents_view_helper.h"
+#include "content/browser/web_contents/web_contents_view_helper.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/aura/client/drag_drop_delegate.h"
@@ -23,14 +23,14 @@ class WebContentsViewDelegate;
 class WebDragDestDelegate;
 }
 
-class CONTENT_EXPORT TabContentsViewAura
+class CONTENT_EXPORT WebContentsViewAura
     : public content::WebContentsView,
       public aura::WindowDelegate,
       public aura::client::DragDropDelegate {
  public:
-  TabContentsViewAura(WebContentsImpl* web_contents,
+  WebContentsViewAura(WebContentsImpl* web_contents,
                       content::WebContentsViewDelegate* delegate);
-  virtual ~TabContentsViewAura();
+  virtual ~WebContentsViewAura();
 
  private:
   void SizeChangedCommon(const gfx::Size& size);
@@ -129,7 +129,7 @@ class CONTENT_EXPORT TabContentsViewAura
   scoped_ptr<content::WebContentsViewDelegate> delegate_;
 
   // Common implementations of some WebContentsView methods.
-  TabContentsViewHelper tab_contents_view_helper_;
+  WebContentsViewHelper web_contents_view_helper_;
 
   WebKit::WebDragOperationsMask current_drag_op_;
 
@@ -137,7 +137,7 @@ class CONTENT_EXPORT TabContentsViewAura
   // has finished.
   bool close_tab_after_drag_ends_;
 
-  DISALLOW_COPY_AND_ASSIGN(TabContentsViewAura);
+  DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
 };
 
-#endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_AURA_H_
+#endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_