NOT FOR REVIEW: Aura on Android

content/shell/browser/shell_views.cc

 // 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.
 
 #include "content/shell/browser/shell.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/context_factory.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 20 matching lines @@
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
+#endif
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
 #include "ui/aura/test/test_screen.h"
 #include "ui/wm/test/wm_test_helper.h"
-#else  // !defined(OS_CHROMEOS)
+#else  // !defined(OS_CHROMEOS) && !dfined(OS_ANDROID)
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 #endif
 
+#if defined(OS_ANDROID)
+#include "base/run_loop.h"
+#include "jni/Shell_jni.h"
+#endif
+
+#if defined(OS_ANDROID)
+using base::android::AttachCurrentThread;
+#endif
+
 namespace content {
 
 namespace {
 // ViewDelegate implementation for aura content shell
 class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate {
  public:
   ShellViewsDelegateAura() : use_transparent_windows_(false) {
   }
 
   ~ShellViewsDelegateAura() override {}
@@ skipping 240 matching lines @@
   // Overridden from TextfieldController
   void ContentsChanged(views::Textfield* sender,
                        const base::string16& new_contents) override {}
   bool HandleKeyEvent(views::Textfield* sender,
                       const ui::KeyEvent& key_event) override {
    if (sender == url_entry_ && key_event.key_code() == ui::VKEY_RETURN) {
      std::string text = base::UTF16ToUTF8(url_entry_->text());
      GURL url(text);
      if (!url.has_scheme()) {
        url = GURL(std::string("http://") + std::string(text));
+       if (url.is_empty() || !url.is_valid())
+         return false;
        url_entry_->SetText(base::ASCIIToUTF16(url.spec()));
      }
      shell_->LoadURL(url);
      return true;
    }
    return false;
   }
 
   // Overridden from ButtonListener
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
@@ skipping 69 matching lines @@
 
   // Contents view contains the web contents view
   View* contents_view_;
   views::WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindowDelegateView);
 };
 
 }  // namespace
 
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
 wm::WMTestHelper* Shell::wm_test_helper_ = NULL;
 gfx::Screen* Shell::test_screen_ = NULL;
 #endif
 views::ViewsDelegate* Shell::views_delegate_ = NULL;
 
 // static
+#if defined(OS_ANDROID)
+bool Shell::Register(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+void CloseShell(JNIEnv* env, jclass clazz, jlong shellPtr) {
+  Shell* shell = reinterpret_cast<Shell*>(shellPtr);
+  shell->Close();
+}
+#endif
+
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
+  LOG(ERROR) << "Shell::PlatformInitialize";
 #if defined(OS_WIN)
   _setmode(_fileno(stdout), _O_BINARY);
   _setmode(_fileno(stderr), _O_BINARY);
 #endif
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Initialize();
-  test_screen_ = aura::TestScreen::Create(gfx::Size());
-  gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_);
+#endif //OS_CHROMEOS
+  // TODO(mfomitchev): We should pick the screen we use on Android.
+  // If we use screen_android, we shouldn't do this.
+//  test_screen_ = aura::TestScreen::Create(gfx::Size());
+//  gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_);
   wm_test_helper_ = new wm::WMTestHelper(default_window_size,
                                          GetContextFactory());
 #else
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
 #endif
   views_delegate_ = new ShellViewsDelegateAura();
 }
 
 void Shell::PlatformExit() {
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   delete wm_test_helper_;
   wm_test_helper_ = NULL;
 
   delete test_screen_;
   test_screen_ = NULL;
 #endif
   delete views_delegate_;
   views_delegate_ = NULL;
   delete platform_;
   platform_ = NULL;
 #if defined(OS_CHROMEOS)
   device::BluetoothAdapterFactory::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #endif
   aura::Env::DeleteInstance();
 }
 
 void Shell::PlatformCleanUp() {
+#if defined(OS_ANDROID)
+  JNIEnv* env = AttachCurrentThread();
+  if (java_object_.is_null())
+    return;
+  Java_Shell_onNativeDestroyed(env, java_object_.obj());
+#endif
 }
 
 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
   if (headless_)
     return;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   if (control == BACK_BUTTON) {
     delegate_view->EnableUIControl(ShellWindowDelegateView::BACK_BUTTON,
         is_enabled);
@@ skipping 11 matching lines @@
     return;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetAddressBarURL(url);
 }
 
 void Shell::PlatformSetIsLoading(bool loading) {
 }
 
 void Shell::PlatformCreateWindow(int width, int height) {
+  LOG(ERROR) << "auraclank: Shell::PlatformCreateWindow";
   if (headless_) {
     content_size_ = gfx::Size(width, height);
     if (!platform_)
       platform_ = new ShellPlatformDataAura(content_size_);
     else
       platform_->ResizeWindow(content_size_);
     return;
   }
-#if defined(OS_CHROMEOS)
+
+//TODO(mfomitchev): nested loop waiting for the compositor
+#if defined(OS_ANDROID)
+  wm_test_helper_->host()->Show();
+//  LOG(ERROR) << "auraclank: Starting nested message loop";
+//  aura::Env::GetInstance()->AddObserver(this);
+//  base::RunLoop().RunUntilIdle();
+//  base::RunLoop run_loop;
+//  quit_closure_ = run_loop.QuitClosure();
+//  base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
+//  base::MessageLoop::ScopedNestableTaskAllower allow_nested(loop);
+//  run_loop.Run();
+#endif
+
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   window_widget_ = views::Widget::CreateWindowWithContextAndBounds(
       new ShellWindowDelegateView(this),
       wm_test_helper_->GetDefaultParent(NULL, NULL, gfx::Rect()),
       gfx::Rect(0, 0, width, height));
 #else
   window_widget_ = new views::Widget;
   views::Widget::InitParams params;
   params.bounds = gfx::Rect(0, 0, width, height);
   params.delegate = new ShellWindowDelegateView(this);
   window_widget_->Init(params);
 #endif
 
   content_size_ = gfx::Size(width, height);
 
   window_ = window_widget_->GetNativeWindow();
   // Call ShowRootWindow on RootWindow created by WMTestHelper without
   // which XWindow owned by RootWindow doesn't get mapped.
+//TODO(mfomitchev)
+#if !defined(OS_ANDROID)
   window_->GetHost()->Show();
+#endif
   window_widget_->Show();
+
+
 }
 
+#if defined(OS_ANDROID)
+// aura::EnvObserver:
+void Shell::OnHostInitialized(aura::WindowTreeHost* host) {
+  LOG(ERROR) << "auraclank: Shell::OnHostInitialized!";
+//  quit_closure_.Run();
+  aura::Env::GetInstance()->RemoveObserver(this);
+}
+#endif
+
+
 void Shell::PlatformSetContents() {
   if (headless_) {
     CHECK(platform_);
     aura::Window* content = web_contents_->GetNativeView();
     aura::Window* parent = platform_->host()->window();
     if (!parent->Contains(content)) {
       parent->AddChild(content);
       content->Show();
     }
     content->SetBounds(gfx::Rect(content_size_));
@@ skipping 31 matching lines @@
     const content::ContextMenuParams& params) {
   if (headless_)
     return true;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->ShowWebViewContextMenu(params);
   return true;
 }
 
 }  // namespace content