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

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

Issue 9963079: Adds a TabContentsViewAura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | content/browser/tab_contents/tab_contents_view_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/tab_contents.cc
===================================================================
--- content/browser/tab_contents/tab_contents.cc (revision 130641)
+++ content/browser/tab_contents/tab_contents.cc (working copy)
@@ -64,7 +64,9 @@
#include "webkit/glue/web_intent_data.h"
#include "webkit/glue/webpreferences.h"
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(USE_AURA)
+#include "content/browser/tab_contents/tab_contents_view_aura.h"
+#elif defined(OS_WIN)
#include "content/browser/tab_contents/tab_contents_view_win.h"
#elif defined(TOOLKIT_GTK)
#include "content/browser/tab_contents/tab_contents_view_gtk.h"
@@ -281,7 +283,9 @@
content::WebContentsViewDelegate* delegate =
content::GetContentClient()->browser()->GetWebContentsViewDelegate(
this);
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(USE_AURA)
+ view_.reset(new TabContentsViewAura(this, delegate));
+#elif defined(OS_WIN)
view_.reset(new TabContentsViewWin(this, delegate));
#elif defined(TOOLKIT_GTK)
view_.reset(new content::TabContentsViewGtk(this, delegate));
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | content/browser/tab_contents/tab_contents_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698