V2 app support step3: Athena's NativeAppWindow

extensions/shell/browser/shell_desktop_controller.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 "extensions/shell/browser/shell_desktop_controller.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/shell/browser/shell_app_delegate.h"
+#include "extensions/shell/browser/shell_apps_client.h"
 #include "extensions/shell/common/switches.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/image_cursors.h"
@@ skipping 128 matching lines @@
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppsFocusRules);
 };
 
 }  // namespace
 
 ShellDesktopController::ShellDesktopController()
-    : app_window_(NULL) {
+    : apps_client_(new ShellAppsClient), app_window_(NULL) {
+  extensions::AppsClient::Set(apps_client_.get());
+
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       AddObserver(this);
   display_configurator_.reset(new ui::DisplayConfigurator);
   display_configurator_->Init(false);
   display_configurator_->ForceInitialConfigure(0);
   display_configurator_->AddObserver(this);
 #endif
-
   CreateRootWindow();
 }
 
 ShellDesktopController::~ShellDesktopController() {
+  extensions::AppsClient::Set(NULL);

[James Cook, 2014/09/18 19:08:26]

nit: I would either move this to the end of this function (to allow
AppsClient::Get() in both the constructor and destructor), or move "new
AppsClient" to the end of the constructor and apps_client_.reset() here (to
disallow AppsClient::Get() in both the constructor and destructor).  I like init
and teardown order to match as exactly as possible.

[oshima, 2014/09/18 20:56:49]

Done.

   CloseAppWindows();
   DestroyRootWindow();
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RemoveObserver(this);
 #endif
 }
 
 aura::WindowTreeHost* ShellDesktopController::GetHost() {
   return host_.get();
@@ skipping 154 matching lines @@
   if (displays.empty())
     return gfx::Size();
   const ui::DisplayMode* mode = displays[0].display->current_mode();
   return mode ? mode->size() : gfx::Size();
 #else
   return gfx::Size();
 #endif
 }
 
 }  // namespace extensions