Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations.

extensions/shell/browser/shell_native_app_window_aura.cc

Index: extensions/shell/browser/shell_native_app_window_aura.cc
diff --git a/extensions/shell/browser/shell_native_app_window_aura.cc b/extensions/shell/browser/shell_native_app_window_aura.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7b96860a21b6fd10b3abd533df30223324c523fd
--- /dev/null
+++ b/extensions/shell/browser/shell_native_app_window_aura.cc
@@ -0,0 +1,71 @@
+// 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 "extensions/shell/browser/shell_native_app_window_aura.h"
+
+#include "content/public/browser/web_contents.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/wm/core/window_util.h"
+
+namespace extensions {
+
+ShellNativeAppWindowAura::ShellNativeAppWindowAura(
+    extensions::AppWindow* app_window,

[James Cook, 2014/11/11 18:23:52]

no need for extensions:: here or below

[Yoyo Zhou, 2014/11/15 01:05:44]

Done.

+    const extensions::AppWindow::CreateParams& params)
+    : ShellNativeAppWindow(app_window, params) {
+  // TODO(yoz): We might have to duplicate this for mac.
+  gfx::Rect bounds = params.GetInitialWindowBounds(GetFrameInsets());
+  bool position_specified =
+      bounds.x() != AppWindow::BoundsSpecification::kUnspecifiedPosition &&
+      bounds.y() != AppWindow::BoundsSpecification::kUnspecifiedPosition;
+  if (!position_specified)
+    bounds.set_origin(GetBounds().origin());
+  SetBounds(bounds);
+}
+
+ShellNativeAppWindowAura::~ShellNativeAppWindowAura() {
+}
+
+bool ShellNativeAppWindowAura::IsActive() const {
+  // Even though app_shell only supports a single app window, there might be
+  // some sort of system-level dialog open and active.
+  aura::Window* window = GetNativeWindow();
+  return window && wm::IsActiveWindow(window);
+}
+
+gfx::NativeWindow ShellNativeAppWindowAura::GetNativeWindow() const {
+  return app_window()->web_contents()->GetNativeView();
+}
+
+gfx::Rect ShellNativeAppWindowAura::GetBounds() const {
+  return GetNativeWindow()->GetBoundsInScreen();
+}
+
+void ShellNativeAppWindowAura::Show() {
+  GetNativeWindow()->Show();
+}
+
+void ShellNativeAppWindowAura::Hide() {
+  GetNativeWindow()->Hide();
+}
+
+void ShellNativeAppWindowAura::Activate() {
+  aura::Window* window = GetNativeWindow();
+  if (window)
+    wm::ActivateWindow(window);
+}
+
+void ShellNativeAppWindowAura::Deactivate() {
+  aura::Window* window = GetNativeWindow();
+  if (window)
+    wm::DeactivateWindow(window);
+}
+
+void ShellNativeAppWindowAura::SetBounds(const gfx::Rect& bounds) {
+  GetNativeWindow()->SetBounds(bounds);
+}
+
+}  // namespace extensions

[James Cook, 2014/11/11 18:23:52]

I know you're just refactoring here, but can you write a trivial unit test for
this class? Just enough to get it into a test harness and verify, for example,
that it gets set up with the right bounds.