| 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_;
|
|
|