V2 app support step3: Athena's NativeAppWindow

extensions/shell/browser/shell_desktop_controller.cc

Index: extensions/shell/browser/shell_desktop_controller.cc
diff --git a/extensions/shell/browser/shell_desktop_controller.cc b/extensions/shell/browser/shell_desktop_controller.cc
index 3d89e166faa0e789aa18f28b4c6de997dd865c21..bb8a185aba860b88af2fc52b849becc1e8d44b23 100644
--- a/extensions/shell/browser/shell_desktop_controller.cc
+++ b/extensions/shell/browser/shell_desktop_controller.cc
@@ -11,6 +11,7 @@
 #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"
@@ -159,7 +160,9 @@ class AppsFocusRules : public wm::BaseFocusRules {
 }  // 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);
@@ -168,7 +171,6 @@ ShellDesktopController::ShellDesktopController()
   display_configurator_->ForceInitialConfigure(0);
   display_configurator_->AddObserver(this);
 #endif
-
   CreateRootWindow();
 }
 
@@ -179,6 +181,7 @@ ShellDesktopController::~ShellDesktopController() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RemoveObserver(this);
 #endif
+  extensions::AppsClient::Set(NULL);
 }
 
 aura::WindowTreeHost* ShellDesktopController::GetHost() {