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

Unified Diff: content/browser/tab_contents/tab_contents.cc

Issue 10031044: TabContents -> WebContentsImpl, part 5. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase (fixed) Created 8 years, 8 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/tab_contents/tab_contents.cc
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 0c555a1113ab583f487e8f4af0710efac3a92693..3afb53e360eb7e482860a361598d9a562bfc3b78 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)

Powered by Google App Engine
This is Rietveld 408576698