Delete activity upon window deletion

athena/main/athena_launcher.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_launcher.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/content/public/content_activity_factory.h"
@@ skipping 69 matching lines @@
 class AthenaViewsDelegate : public views::ViewsDelegate {
  public:
   AthenaViewsDelegate() {}
   virtual ~AthenaViewsDelegate() {}
 
  private:
   // views::ViewsDelegate:
   virtual void OnBeforeWidgetInit(
       views::Widget::InitParams* params,
       views::internal::NativeWidgetDelegate* delegate) OVERRIDE {
+    params->context = athena::ScreenManager::Get()->GetContext();
   }
 
   DISALLOW_COPY_AND_ASSIGN(AthenaViewsDelegate);
 };
 
 void StartAthenaEnv(aura::Window* root_window,
                     athena::ScreenManagerDelegate* delegate,
                     scoped_refptr<base::TaskRunner> file_runner) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
@@ skipping 20 matching lines @@
   athena::ScreenManager::Create(delegate, root_window);
   athena::WindowManager::Create();
   athena::AppRegistry::Create();
   SetupBackgroundImage();
 
   athena::ScreenManager::Get()->GetContext()->SetProperty(
       kAthenaEnvStateKey, env_state);
 }
 
 void StartAthenaSessionWithContext(content::BrowserContext* context) {
-  athena::ExtensionsDelegate::CreateExtensionsDelegateForShell(context);
   StartAthenaSession(new athena::ContentActivityFactory(),
                      new athena::ContentAppModelBuilder(context));
   athena::VirtualKeyboardManager::Create(context);
   athena::HomeCard::Get()->RegisterSearchProvider(
       new athena::UrlSearchProvider(context));
   AthenaEnvState* env_state =
       athena::ScreenManager::Get()->GetContext()->GetProperty(
           kAthenaEnvStateKey);
 
   env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver);
@@ skipping 16 matching lines @@
   athena::WindowManager::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::SystemUI::Shutdown();
   athena::ExtensionsDelegate::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }
 
 }  // namespace athena