NOT FOR REVIEW: Aura on Android

content/shell/browser/shell.h

Index: content/shell/browser/shell.h
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
index cf461712b130146f79d93233482713c36671b8ce..3f85d8ce2322063dfa7b181001fd8ae6df36f738 100644
--- a/content/shell/browser/shell.h
+++ b/content/shell/browser/shell.h
@@ -20,8 +20,12 @@
 
 #if defined(OS_ANDROID)
 #include "base/android/scoped_java_ref.h"
-#elif defined(USE_AURA)
-#if defined(OS_CHROMEOS)
+#endif
+#if defined(USE_AURA) && defined(OS_ANDROID)
+#include "ui/aura/env_observer.h"
+#endif
+#if defined(USE_AURA)
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
 namespace gfx {
 class Screen;
 }
@@ -51,7 +55,12 @@ class WebContents;
 // This represents one window of the Content Shell, i.e. all the UI including
 // buttons and url bar, as well as the web content area.
 class Shell : public WebContentsDelegate,
-              public WebContentsObserver {
+#if defined(USE_AURA) && defined(OS_ANDROID)
+              public aura::EnvObserver,
+#endif
+              public WebContentsObserver
+
+{
  public:
   ~Shell() override;
 
@@ -117,7 +126,7 @@ class Shell : public WebContentsDelegate,
                       bool* was_blocked) override;
   void LoadingStateChanged(WebContents* source,
                            bool to_different_document) override;
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   void LoadProgressChanged(WebContents* source, double progress) override;
 #endif
   void EnterFullscreenModeForTab(WebContents* web_contents,
@@ -201,6 +210,11 @@ class Shell : public WebContentsDelegate,
   bool PlatformIsFullscreenForTabOrPending(
       const WebContents* web_contents) const;
 #endif
+#if defined(USE_AURA) && defined(OS_ANDROID)
+  // aura::EnvObserver:
+  void OnWindowInitialized(aura::Window* window) override {}
+  void OnHostInitialized(aura::WindowTreeHost* host) override;
+#endif
 
   gfx::NativeView GetContentView();
 
@@ -228,8 +242,9 @@ class Shell : public WebContentsDelegate,
 
 #if defined(OS_ANDROID)
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
-#elif defined(USE_AURA)
-#if defined(OS_CHROMEOS)
+#endif
+#if defined(USE_AURA)
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   static wm::WMTestHelper* wm_test_helper_;
   static gfx::Screen* test_screen_;
 #endif
@@ -252,6 +267,11 @@ class Shell : public WebContentsDelegate,
   // True if the destructur of Shell should post a quit closure on the current
   // message loop if the destructed Shell object was the last one.
   static bool quit_message_loop_;
+
+#if defined(USE_AURA) && defined(OS_ANDROID)
+  // Closure for quitting nested message loop.
+   base::Closure quit_closure_;
+#endif
 };
 
 }  // namespace content