| Index: content/shell/shell.h
|
| diff --git a/content/shell/shell.h b/content/shell/shell.h
|
| index 82e2a6a233bd3956fcdd0d729be57c12473f70a5..e2162e8c27212b99b405837b3747ef486164b06c 100644
|
| --- a/content/shell/shell.h
|
| +++ b/content/shell/shell.h
|
| @@ -1,7 +1,6 @@
|
| // Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| -
|
| #ifndef CONTENT_SHELL_SHELL_H_
|
| #define CONTENT_SHELL_SHELL_H_
|
|
|
| @@ -27,15 +26,15 @@ typedef struct _GtkToolItem GtkToolItem;
|
| #elif defined(OS_ANDROID)
|
| #include "base/android/scoped_java_ref.h"
|
| #elif defined(USE_AURA)
|
| +#if defined(OS_CHROMEOS)
|
| +namespace content {
|
| +class MinimalAsh;
|
| +}
|
| +#endif
|
| namespace views {
|
| class Widget;
|
| class ViewsDelegate;
|
| }
|
| -namespace aura {
|
| -namespace client {
|
| -class StackingClient;
|
| -}
|
| -}
|
| #endif
|
|
|
| class GURL;
|
| @@ -237,7 +236,9 @@ class Shell : public WebContentsDelegate,
|
| #elif defined(OS_ANDROID)
|
| base::android::ScopedJavaGlobalRef<jobject> java_object_;
|
| #elif defined(USE_AURA)
|
| - static aura::client::StackingClient* stacking_client_;
|
| +#if defined(OS_CHROMEOS)
|
| + static content::MinimalAsh* minimal_ash_;
|
| +#endif
|
| static views::ViewsDelegate* views_delegate_;
|
|
|
| views::Widget* window_widget_;
|
|
|