NOT FOR REVIEW: Aura Android: Content Shell compiles

content/shell/browser/shell.h

 // Copyright 2013 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_BROWSER_SHELL_H_
 #define CONTENT_SHELL_BROWSER_SHELL_H_
 
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ipc/ipc_channel.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
 #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;
 }
 namespace wm {
 class WMTestHelper;
 }
 #endif  // defined(OS_CHROMEOS)
 namespace views {
 class Widget;
 class ViewsDelegate;
 }
 #endif  // defined(USE_AURA)
 
 class GURL;
 namespace content {
 
 #if defined(USE_AURA)
 class ShellPlatformDataAura;
 #endif
 
 class BrowserContext;
 class ShellDevToolsFrontend;
 class ShellJavaScriptDialogManager;
 class SiteInstance;
 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;
 
   void LoadURL(const GURL& url);
   void LoadURLForFrame(const GURL& url, const std::string& frame_name);
   void LoadDataWithBaseURL(const GURL& url,
                            const std::string& data,
                            const GURL& base_url);
   void GoBackOrForward(int offset);
   void Reload();
@@ skipping 45 matching lines @@
   WebContents* OpenURLFromTab(WebContents* source,
                               const OpenURLParams& params) override;
   void AddNewContents(WebContents* source,
                       WebContents* new_contents,
                       WindowOpenDisposition disposition,
                       const gfx::Rect& initial_rect,
                       bool user_gesture,
                       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,
                                  const GURL& origin) override;
   void ExitFullscreenModeForTab(WebContents* web_contents) override;
   bool IsFullscreenForTabOrPending(
       const WebContents* web_contents) const override;
   blink::WebDisplayMode GetDisplayMode(
      const WebContents* web_contents) const override;
   void RequestToLockMouse(WebContents* web_contents,
@@ skipping 66 matching lines @@
   // Set the title of shell window
   void PlatformSetTitle(const base::string16& title);
   // User right-clicked on the web view
   bool PlatformHandleContextMenu(const content::ContextMenuParams& params);
 #if defined(OS_ANDROID)
   void PlatformToggleFullscreenModeForTab(WebContents* web_contents,
                                           bool enter_fullscreen);
   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();
 
   void ToggleFullscreenModeForTab(WebContents* web_contents,
                                   bool enter_fullscreen);
   // WebContentsObserver
   void TitleWasSet(NavigationEntry* entry, bool explicit_set) override;
 
   void InnerShowDevTools();
   void OnDevToolsWebContentsDestroyed();
 
   scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_;
 
   scoped_ptr<WebContents> web_contents_;
 
   scoped_ptr<DevToolsWebContentsObserver> devtools_observer_;
   ShellDevToolsFrontend* devtools_frontend_;
 
   bool is_fullscreen_;
 
   gfx::NativeWindow window_;
   gfx::NativeEditView url_edit_view_;
 
   gfx::Size content_size_;
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   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
 #if defined(TOOLKIT_VIEWS)
   static views::ViewsDelegate* views_delegate_;
 
   views::Widget* window_widget_;
 #endif // defined(TOOLKIT_VIEWS)
   static ShellPlatformDataAura* platform_;
 #endif  // defined(USE_AURA)
 
   bool headless_;
 
   // A container of all the open windows. We use a vector so we can keep track
   // of ordering.
   static std::vector<Shell*> windows_;
 
   static base::Callback<void(Shell*)> shell_created_callback_;
 
   // 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
 
 #endif  // CONTENT_SHELL_BROWSER_SHELL_H_