Separate athena's startup process from AppShell's

athena/env/athena_env_impl.cc

Index: athena/env/athena_env_impl.cc
diff --git a/athena/env/athena_env_impl.cc b/athena/env/athena_env_impl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3a4a1bdbfa54662960a7dd21579773bb69cd3e53
--- /dev/null
+++ b/athena/env/athena_env_impl.cc
@@ -0,0 +1,254 @@
+// Copyright 2014 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 "athena/env/public/athena_env.h"
+
+#include "athena/common/fill_layout_manager.h"
+#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/cursor_client.h"
+#include "ui/aura/client/default_capture_client.h"
+#include "ui/aura/env.h"
+#include "ui/aura/test/test_screen.h"
+#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_tree_host.h"
+#include "ui/aura/window_tree_host_observer.h"
+#include "ui/base/cursor/cursor.h"
+#include "ui/base/cursor/image_cursors.h"
+#include "ui/chromeos/user_activity_power_manager_notifier.h"
+#include "ui/display/chromeos/display_configurator.h"
+#include "ui/display/types/chromeos/display_mode.h"
+#include "ui/display/types/chromeos/display_snapshot.h"
+#include "ui/gfx/screen.h"
+#include "ui/wm/core/compound_event_filter.h"
+#include "ui/wm/core/cursor_manager.h"
+#include "ui/wm/core/input_method_event_filter.h"
+#include "ui/wm/core/native_cursor_manager.h"
+#include "ui/wm/core/native_cursor_manager_delegate.h"
+#include "ui/wm/core/user_activity_detector.h"
+
+namespace athena {
+
+namespace {
+
+AthenaEnv* instance = NULL;
+
+// A class that bridges the gap between CursorManager and Aura. It borrows
+// heavily from AshNativeCursorManager.
+class AthenaNativeCursorManager : public wm::NativeCursorManager {
+ public:
+  explicit AthenaNativeCursorManager(aura::WindowTreeHost* host)
+      : host_(host), image_cursors_(new ui::ImageCursors) {}
+  virtual ~AthenaNativeCursorManager() {}
+
+  // wm::NativeCursorManager overrides.
+  virtual void SetDisplay(const gfx::Display& display,
+                          wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
+    if (image_cursors_->SetDisplay(display, display.device_scale_factor()))
+      SetCursor(delegate->GetCursor(), delegate);
+  }
+
+  virtual void SetCursor(gfx::NativeCursor cursor,
+                         wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
+    image_cursors_->SetPlatformCursor(&cursor);
+    cursor.set_device_scale_factor(image_cursors_->GetScale());
+    delegate->CommitCursor(cursor);
+
+    if (delegate->IsCursorVisible())
+      ApplyCursor(cursor);
+  }
+
+  virtual void SetVisibility(
+      bool visible,
+      wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
+    delegate->CommitVisibility(visible);
+
+    if (visible) {
+      SetCursor(delegate->GetCursor(), delegate);
+    } else {
+      gfx::NativeCursor invisible_cursor(ui::kCursorNone);
+      image_cursors_->SetPlatformCursor(&invisible_cursor);
+      ApplyCursor(invisible_cursor);
+    }
+  }
+
+  virtual void SetCursorSet(
+      ui::CursorSetType cursor_set,
+      wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
+    image_cursors_->SetCursorSet(cursor_set);
+    delegate->CommitCursorSet(cursor_set);
+    if (delegate->IsCursorVisible())
+      SetCursor(delegate->GetCursor(), delegate);
+  }
+
+  virtual void SetMouseEventsEnabled(
+      bool enabled,
+      wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
+    delegate->CommitMouseEventsEnabled(enabled);
+    SetVisibility(delegate->IsCursorVisible(), delegate);
+  }
+
+ private:
+  // Sets |cursor| as the active cursor within Aura.
+  void ApplyCursor(gfx::NativeCursor cursor) { host_->SetCursor(cursor); }
+
+  aura::WindowTreeHost* host_;  // Not owned.
+
+  scoped_ptr<ui::ImageCursors> image_cursors_;
+
+  DISALLOW_COPY_AND_ASSIGN(AthenaNativeCursorManager);
+};
+
+class AthenaEnvImpl : public AthenaEnv,
+                      public aura::WindowTreeHostObserver,
+                      public ui::DisplayConfigurator::Observer {
+ public:
+  AthenaEnvImpl() : display_configurator_(new ui::DisplayConfigurator) {
+    display_configurator_->Init(false);
+    display_configurator_->ForceInitialConfigure(0);
+    display_configurator_->AddObserver(this);
+
+    gfx::Size screen_size = GetPrimaryDisplaySize();
+    if (screen_size.IsEmpty())
+      screen_size.SetSize(1280, 720);

[Jun Mukai, 2014/08/23 01:15:35]

If it falls back to 1280x720 here, why not returning it from
GetPrimaryDisplaySize()?

[oshima, 2014/08/23 01:19:36]

This is used in OnDisplayModeChanged, and I don't want to use
default if it ever failed to get the display mode.

+    screen_.reset(aura::TestScreen::Create(screen_size));
+
+    gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
+    host_.reset(screen_->CreateHostForPrimaryDisplay());
+    host_->InitHost();
+
+    aura::Window* root_window = GetHost()->window();
+    input_method_filter_.reset(
+        new ::wm::InputMethodEventFilter(host_->GetAcceleratedWidget()));
+    input_method_filter_->SetInputMethodPropertyInRootWindow(root_window);
+
+    root_window_event_filter_.reset(new wm::CompoundEventFilter);
+    host_->window()->AddPreTargetHandler(root_window_event_filter_.get());
+
+    input_method_filter_.reset(
+        new wm::InputMethodEventFilter(host_->GetAcceleratedWidget()));
+    input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window());
+    root_window_event_filter_->AddHandler(input_method_filter_.get());
+
+    capture_client_.reset(
+        new aura::client::DefaultCaptureClient(host_->window()));
+
+    // Ensure new windows fill the display.
+    root_window->SetLayoutManager(new FillLayoutManager(root_window));
+
+    cursor_manager_.reset(
+        new wm::CursorManager(scoped_ptr<wm::NativeCursorManager>(
+            new AthenaNativeCursorManager(host_.get()))));
+    cursor_manager_->SetDisplay(
+        gfx::Screen::GetNativeScreen()->GetPrimaryDisplay());
+    cursor_manager_->SetCursor(ui::kCursorPointer);
+    aura::client::SetCursorClient(host_->window(), cursor_manager_.get());
+
+    user_activity_detector_.reset(new wm::UserActivityDetector);
+    host_->event_processor()->GetRootTarget()->AddPreTargetHandler(
+        user_activity_detector_.get());
+    user_activity_notifier_.reset(new ui::UserActivityPowerManagerNotifier(
+        user_activity_detector_.get()));
+
+    host_->AddObserver(this);
+    host_->Show();
+
+    DCHECK(!instance);
+    instance = this;
+  }
+
+  virtual ~AthenaEnvImpl() {
+    instance = NULL;
+
+    host_->RemoveObserver(this);
+    if (input_method_filter_)
+      root_window_event_filter_->RemoveHandler(input_method_filter_.get());
+    if (user_activity_detector_) {
+      host_->event_processor()->GetRootTarget()->RemovePreTargetHandler(
+          user_activity_detector_.get());
+    }
+    root_window_event_filter_.reset();
+    capture_client_.reset();
+    input_method_filter_.reset();
+    cursor_manager_.reset();
+    user_activity_notifier_.reset();
+    user_activity_detector_.reset();
+
+    input_method_filter_.reset();
+    host_.reset();
+    screen_.reset();
+    gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
+
+    aura::Env::DeleteInstance();
+
+    display_configurator_->RemoveObserver(this);
+    display_configurator_.reset();
+  }
+
+ private:
+  virtual aura::WindowTreeHost* GetHost() OVERRIDE { return host_.get(); }
+
+  // AthenaEnv:
+  virtual void SetDisplayWorkAreaInsets(const gfx::Insets& insets) OVERRIDE {
+    screen_->SetWorkAreaInsets(insets);
+  }
+
+  // ui::DisplayConfigurator::Observer:
+  virtual void OnDisplayModeChanged(const std::vector<
+      ui::DisplayConfigurator::DisplayState>& displays) OVERRIDE {
+    gfx::Size size = GetPrimaryDisplaySize();
+    if (!size.IsEmpty())
+      host_->UpdateRootWindowSize(size);
+  }
+
+  // aura::WindowTreeHostObserver:
+  virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) OVERRIDE {
+    base::MessageLoopForUI::current()->PostTask(
+        FROM_HERE, base::MessageLoop::QuitClosure());
+  }
+
+  gfx::Size GetPrimaryDisplaySize() const {
+    const std::vector<ui::DisplayConfigurator::DisplayState>& displays =
+        display_configurator_->cached_displays();
+    if (displays.empty())
+      return gfx::Size();
+    const ui::DisplayMode* mode = displays[0].display->current_mode();
+    return mode ? mode->size() : gfx::Size();
+  }
+
+  scoped_ptr<aura::TestScreen> screen_;
+  scoped_ptr<aura::WindowTreeHost> host_;
+
+  scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_;

[Jun Mukai, 2014/08/23 01:11:12]

Does it have to be in ::wm namespace explicitly?  It seems CompountEventFilter,
CursorManager, and UserActivityDetector is simply in wm namespace.  It's better
to be in the same style, and I'd prefer to omit the first :: if possible.

[oshima, 2014/08/23 01:19:35]

Done.

+  scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_;
+  scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
+  scoped_ptr<wm::CursorManager> cursor_manager_;
+  scoped_ptr<wm::UserActivityDetector> user_activity_detector_;
+  scoped_ptr<ui::DisplayConfigurator> display_configurator_;
+  scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
+
+  DISALLOW_COPY_AND_ASSIGN(AthenaEnvImpl);
+};
+
+}  // namespace
+
+// static
+void AthenaEnv::Create() {
+  DCHECK(!instance);
+  new AthenaEnvImpl();
+}
+
+AthenaEnv* AthenaEnv::Get() {
+  DCHECK(instance);
+  return instance;
+}
+
+// static
+
+// static
+void AthenaEnv::Shutdown() {
+  DCHECK(instance);
+  delete instance;
+}
+
+}  // namespace athena