kiosk: Close on the last window of kiosk app.

chrome/browser/chromeos/app_mode/app_session_lifetime.cc

 // Copyright 2013 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 "chrome/browser/chromeos/app_mode/app_session_lifetime.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 20 matching lines @@
 #include "extensions/browser/app_window/app_window_registry.h"
 
 using extensions::AppWindow;
 using extensions::AppWindowRegistry;
 
 namespace chromeos {
 
 namespace {
 
 // AppWindowHandler watches for app window and exits the session when the
-// last app window is closed.
+// last window of a given app is closed.
 class AppWindowHandler : public AppWindowRegistry::Observer {
  public:
   AppWindowHandler() : window_registry_(NULL) {}
   ~AppWindowHandler() override {}
 
-  void Init(Profile* profile) {
+  void Init(Profile* profile, const std::string& app_id) {
     DCHECK(!window_registry_);
     window_registry_ = AppWindowRegistry::Get(profile);
     if (window_registry_)
       window_registry_->AddObserver(this);
+    app_id_ = app_id;
   }
 
  private:
   // extensions::AppWindowRegistry::Observer overrides:
   void OnAppWindowRemoved(AppWindow* app_window) override {
-    if (window_registry_->app_windows().empty()) {
+    if (window_registry_->GetAppWindowsForApp(app_id_).empty()) {
       if (DemoAppLauncher::IsDemoAppSession(
               user_manager::UserManager::Get()->GetActiveUser()->email())) {
         // If we were in demo mode, we disabled all our network technologies,
         // re-enable them.
         NetworkStateHandler* handler =
             NetworkHandler::Get()->network_state_handler();
         handler->SetTechnologyEnabled(
             NetworkTypePattern::NonVirtual(),
             true,
             chromeos::network_handler::ErrorCallback());
       }
       chrome::AttemptUserExit();
       window_registry_->RemoveObserver(this);
     }
   }
 
   AppWindowRegistry* window_registry_;
+  std::string app_id_;

[bartfab (slow), 2015/01/26 15:59:46]

Nit: const.

[xiyuan, 2015/01/26 17:21:32]

Cannot use const here because we use it as a AppWindowHandler and app is is set
via an Init call instead of constructor.

 
   DISALLOW_COPY_AND_ASSIGN(AppWindowHandler);
 };
 
 base::LazyInstance<AppWindowHandler> app_window_handler
     = LAZY_INSTANCE_INITIALIZER;
 
 // BrowserWindowHandler monitors Browser object being created during
 // a kiosk session, log info such as URL so that the code path could be
 // fixed and closes the just opened browser window.
@@ skipping 29 matching lines @@
 };
 
 base::LazyInstance<BrowserWindowHandler> browser_window_handler
     = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 void InitAppSession(Profile* profile, const std::string& app_id) {
   // Binds the session lifetime with app window counts.
   CHECK(app_window_handler == NULL);
-  app_window_handler.Get().Init(profile);
+  app_window_handler.Get().Init(profile, app_id);
 
   CHECK(browser_window_handler == NULL);
   browser_window_handler.Get();
 
   // For a demo app, we don't need to either setup the update service or
   // the idle app name notification.
   if (DemoAppLauncher::IsDemoAppSession(
           user_manager::UserManager::Get()->GetActiveUser()->email()))
     return;
 
@@ skipping 13 matching lines @@
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   if (!connector->IsEnterpriseManaged()) {
     PrefService* local_state = g_browser_process->local_state();
     local_state->SetBoolean(prefs::kRebootAfterUpdate, true);
     KioskModeIdleAppNameNotification::Initialize();
   }
 }
 
 }  // namespace chromeos