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

Unified Diff: trunk/src/content/shell/browser/shell.h

Issue 30413002: Revert 229507 "aura: Allow creating content_shell without views." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « trunk/src/content/shell/DEPS ('k') | trunk/src/content/shell/browser/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/shell/browser/shell.h
===================================================================
--- trunk/src/content/shell/browser/shell.h (revision 229520)
+++ trunk/src/content/shell/browser/shell.h (working copy)
@@ -39,10 +39,6 @@
class GURL;
namespace content {
-#if defined(USE_AURA)
-class ShellAuraPlatformData;
-#endif
-
class BrowserContext;
class ShellDevToolsFrontend;
class ShellJavaScriptDialogManager;
@@ -263,13 +259,9 @@
#if defined(OS_CHROMEOS)
static shell::MinimalShell* minimal_shell_;
#endif
-#if defined(TOOLKIT_VIEWS)
static views::ViewsDelegate* views_delegate_;
views::Widget* window_widget_;
-#else // defined(TOOLKIT_VIEWS)
- scoped_ptr<ShellAuraPlatformData> platform_;
-#endif // defined(TOOLKIT_VIEWS)
#elif defined(OS_MACOSX)
int content_width_;
int content_height_;
« no previous file with comments | « trunk/src/content/shell/DEPS ('k') | trunk/src/content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698