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 594990bedd0b5acc036e07e2c11cb0bf15dd11ab..81ded5beaeb2a760070ceb845f9ef03233a5a89a 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,11 +171,11 @@ ShellDesktopController::ShellDesktopController()
   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)