#include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"
-#include "apps/shell_window.h"
-#include "apps/shell_window_registry.h"
-#include "ash/wm/window_state.h"
+#include "apps/app_window.h"
+#include "apps/app_window_registry.h"
#include "base/basictypes.h"
+#include "base/bind.h"
#include "base/lazy_instance.h"
+#include "base/message_loop/message_loop.h"
#include "base/prefs/pref_service.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_update_service.h"
+#include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"
+#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
+#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/browser/policy/browser_policy_connector.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_observer.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/pref_names.h"
+#include "content/public/browser/web_contents.h"
-using apps::ShellWindowRegistry;
+using apps::AppWindowRegistry;
namespace chromeos {
namespace {
// AppWindowHandler watches for app window and exits the session when the
-// last app window is closed. It also initializes the kiosk app window so
-// that it receives all function keys as a temp solution before underlying
-// http:://crbug.com/166928 is fixed..
-class AppWindowHandler : public ShellWindowRegistry::Observer {
+// last app window is closed.
+class AppWindowHandler : public AppWindowRegistry::Observer {
public:
AppWindowHandler() : window_registry_(NULL) {}
virtual ~AppWindowHandler() {}
void Init(Profile* profile) {
DCHECK(!window_registry_);
- window_registry_ = ShellWindowRegistry::Get(profile);
+ window_registry_ = AppWindowRegistry::Get(profile);
if (window_registry_)
window_registry_->AddObserver(this);
}
private:
- // apps::ShellWindowRegistry::Observer overrides:
- virtual void OnShellWindowAdded(apps::ShellWindow* shell_window) OVERRIDE {
- // Set flags to allow kiosk app to receive all function keys.
- // TODO(xiyuan): Remove this after http:://crbug.com/166928.
- ash::wm::WindowState* window_state =
- ash::wm::GetWindowState(shell_window->GetNativeWindow());
- window_state->set_top_row_keys_are_function_keys(true);
- }
- virtual void OnShellWindowIconChanged(apps::ShellWindow* shell_window)
- OVERRIDE {}
- virtual void OnShellWindowRemoved(apps::ShellWindow* shell_window) OVERRIDE {
- if (window_registry_->shell_windows().empty()) {
+ // apps::AppWindowRegistry::Observer overrides:
+ virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE {}
+ virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE {}
+ virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE {
+ if (window_registry_->app_windows().empty()) {
chrome::AttemptUserExit();
window_registry_->RemoveObserver(this);
}
}
- apps::ShellWindowRegistry* window_registry_;
+ apps::AppWindowRegistry* window_registry_;
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.
+class BrowserWindowHandler : public chrome::BrowserListObserver {
+ public:
+ BrowserWindowHandler() {
+ BrowserList::AddObserver(this);
+ }
+ virtual ~BrowserWindowHandler() {
+ BrowserList::RemoveObserver(this);
+ }
+
+ private:
+ void HandleBrowser(Browser* browser) {
+ content::WebContents* active_tab =
+ browser->tab_strip_model()->GetActiveWebContents();
+ std::string url_string =
+ active_tab ? active_tab->GetURL().spec() : std::string();
+ LOG(WARNING) << "Browser opened in kiosk session"
+ << ", url=" << url_string;
+
+ browser->window()->Close();
+ }
+
+ // chrome::BrowserListObserver overrides:
+ virtual void OnBrowserAdded(Browser* browser) OVERRIDE {
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE,
+ base::Bind(&BrowserWindowHandler::HandleBrowser,
+ base::Unretained(this), // LazyInstance, always valid
+ browser));
+ }
+
+ DISALLOW_COPY_AND_ASSIGN(BrowserWindowHandler);
+};
+
+base::LazyInstance<BrowserWindowHandler> browser_window_handler
+ = LAZY_INSTANCE_INITIALIZER;
+
} // namespace
void InitAppSession(Profile* profile, const std::string& app_id) {
CHECK(app_window_handler == NULL);
app_window_handler.Get().Init(profile);
+ 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(
+ chromeos::UserManager::Get()->GetActiveUser()->email()))
+ return;
+
// Set the app_id for the current instance of KioskAppUpdateService.
KioskAppUpdateService* update_service =
KioskAppUpdateServiceFactory::GetForProfile(profile);
if (update_service)
update_service->set_app_id(app_id);
- // If the device is not enterprise managed, set prefs to reboot after update.
- if (!g_browser_process->browser_policy_connector()->IsEnterpriseManaged()) {
+ // If the device is not enterprise managed, set prefs to reboot after update
+ // and create a user security message which shows the user the application
+ // name and author after some idle timeout.
+ 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();
}
}
projects / platform / framework / web / crosswalk.git / blobdiff