NOT FOR REVIEW: Aura on 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)
+#endif
+#if defined(USE_AURA)
 #if defined(OS_CHROMEOS)
 namespace gfx {
 class Screen;
 }
 namespace wm {
 class WMTestHelper;
 }
 #endif  // defined(OS_CHROMEOS)
 namespace views {
 class Widget;
@@ skipping 76 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 90 matching lines @@
 
   bool is_fullscreen_;
 
   gfx::NativeWindow window_;
   gfx::NativeEditView url_edit_view_;
 
   gfx::Size content_size_;
 
 #if defined(OS_ANDROID)
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
-#elif defined(USE_AURA)
+#endif
+#if defined(USE_AURA)
 #if defined(OS_CHROMEOS)
   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_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_SHELL_H_