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

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

Issue 26695007: aura: Allow creating content_shell without views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unrevert Created 7 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
« no previous file with comments | « content/shell/browser/shell.h ('k') | content/shell/browser/shell_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell.cc
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index 55cf85a55c65cda3398e35c20e1982b3259e5e61..8f64cdcf8d43816eabbfe649639d08e8d2157b9a 100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -29,6 +29,10 @@
#include "content/shell/common/shell_messages.h"
#include "content/shell/common/shell_switches.h"
+#if defined(USE_AURA) && !defined(TOOLKIT_VIEWS)
+#include "content/shell/browser/shell_aura.h"
+#endif
+
namespace content {
const int Shell::kDefaultTestWindowWidthDip = 800;
« no previous file with comments | « content/shell/browser/shell.h ('k') | content/shell/browser/shell_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698