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

athena/main/athena_main_delegate.cc

 // 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/main/athena_main_delegate.h"
 
 #include "athena/content/public/web_contents_view_delegate_creator.h"
 #include "athena/env/public/athena_env.h"
 #include "athena/main/athena_content_client.h"
 #include "athena/main/athena_renderer_pdf_helper.h"
 #include "athena/main/public/athena_launcher.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "components/pdf/renderer/ppb_pdf_impl.h"
 #include "content/public/app/content_main.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/shell/browser/desktop_controller.h"
 #include "extensions/shell/browser/shell_browser_main_delegate.h"
 #include "extensions/shell/browser/shell_content_browser_client.h"
 #include "extensions/shell/browser/shell_extension_system.h"
 #include "extensions/shell/common/shell_content_client.h"
 #include "extensions/shell/common/switches.h"
 #include "extensions/shell/renderer/shell_content_renderer_client.h"
 #include "ppapi/c/private/ppb_pdf.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace athena {
 namespace {
 
 // We want to load the sample calculator app by default, for a while. Expecting
 // to run athena_main at src/
 const char kDefaultAppPath[] =
     "chrome/common/extensions/docs/examples/apps/calculator/app";
 
 class AthenaDesktopController : public extensions::DesktopController {
  public:
   AthenaDesktopController() {}
   ~AthenaDesktopController() override {}
 
  private:
   // extensions::DesktopController:
-  virtual aura::WindowTreeHost* GetHost() override {
-    return athena::AthenaEnv::Get()->GetHost();
+  virtual gfx::Size GetWindowSize() override {
+    return athena::AthenaEnv::Get()->GetHost()->window()->bounds().size();
   }
 
   // Creates a new app window and adds it to the desktop. The desktop maintains
   // ownership of the window.
   // TODO(jamescook|oshima): Is this function needed?
   virtual extensions::AppWindow* CreateAppWindow(
       content::BrowserContext* context,
       const extensions::Extension* extension) override {
     NOTIMPLEMENTED();
     return nullptr;
@@ skipping 111 matching lines @@
 
 void AthenaMainDelegate::InitializeResourceBundle() {
   base::FilePath pak_dir;
   PathService::Get(base::DIR_MODULE, &pak_dir);
   base::FilePath pak_file =
       pak_dir.Append(FILE_PATH_LITERAL("athena_resources.pak"));
   ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
 }
 
 }  // namespace athena