summaryrefslogtreecommitdiffstats
path: root/content/browser/tab_contents/tab_contents.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-11 16:18:35 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-11 16:18:35 +0000
commit6eddfd447c7c6f3e0fb9a5e46761c857592e9efd (patch)
tree12558656e0d7804a5b456e126f1ca4e5fbbdeca7 /content/browser/tab_contents/tab_contents.cc
parent2efdbfd1a2f7c3eda02d44c66dafd3266fe407f7 (diff)
downloadchromium_src-6eddfd447c7c6f3e0fb9a5e46761c857592e9efd.zip
chromium_src-6eddfd447c7c6f3e0fb9a5e46761c857592e9efd.tar.gz
chromium_src-6eddfd447c7c6f3e0fb9a5e46761c857592e9efd.tar.bz2
TabContents -> WebContentsImpl, part 5.
TabContentsViewAura -> WebContentsViewAura TabContentsViewGtk -> WebContentsViewGtk TabContentsViewHelper -> WebContentsViewHelper TabContentsViewWin -> WebContentsViewWin BUG=105875 TEST=no change Review URL: https://chromiumcodereview.appspot.com/10031044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tab_contents/tab_contents.cc')
-rw-r--r--content/browser/tab_contents/tab_contents.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 0c555a1..3afb53e 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -66,11 +66,11 @@
#include "webkit/glue/webpreferences.h"
#if defined(USE_AURA)
-#include "content/browser/tab_contents/tab_contents_view_aura.h"
+#include "content/browser/web_contents/web_contents_view_aura.h"
#elif defined(OS_WIN)
-#include "content/browser/tab_contents/tab_contents_view_win.h"
+#include "content/browser/web_contents/web_contents_view_win.h"
#elif defined(TOOLKIT_GTK)
-#include "content/browser/tab_contents/tab_contents_view_gtk.h"
+#include "content/browser/web_contents/web_contents_view_gtk.h"
#elif defined(OS_MACOSX)
#include "content/browser/web_contents/web_contents_view_mac.h"
#include "ui/gfx/surface/io_surface_support_mac.h"
@@ -287,11 +287,11 @@ WebContentsImpl::WebContentsImpl(
content::GetContentClient()->browser()->GetWebContentsViewDelegate(
this);
#if defined(USE_AURA)
- view_.reset(new TabContentsViewAura(this, delegate));
+ view_.reset(new WebContentsViewAura(this, delegate));
#elif defined(OS_WIN)
- view_.reset(new TabContentsViewWin(this, delegate));
+ view_.reset(new WebContentsViewWin(this, delegate));
#elif defined(TOOLKIT_GTK)
- view_.reset(new content::TabContentsViewGtk(this, delegate));
+ view_.reset(new content::WebContentsViewGtk(this, delegate));
#elif defined(OS_MACOSX)
view_.reset(web_contents_view_mac::CreateWebContentsView(this, delegate));
#elif defined(OS_ANDROID)