Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / ash / wm / overview / window_selector_controller.cc

diff --git a/src/ash/wm/overview/window_selector_controller.cc b/src/ash/wm/overview/window_selector_controller.cc
index d56c463..7af06f3 100644 (file)
--- a/src/ash/wm/overview/window_selector_controller.cc
+++ b/src/ash/wm/overview/window_selector_controller.cc
@@ -4,13 +4,17 @@
 
 #include "ash/wm/overview/window_selector_controller.h"
 
+#include "ash/metrics/user_metrics_recorder.h"
+#include "ash/root_window_controller.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
-#include "ash/shell_delegate.h"
+#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/window_selector.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/metrics/histogram.h"
+#include "ui/aura/window.h"
 
 namespace ash {
 
@@ -23,15 +27,21 @@ WindowSelectorController::~WindowSelectorController() {
 // static
 bool WindowSelectorController::CanSelect() {
   // Don't allow a window overview if the screen is locked or a modal dialog is
-  // open.
+  // open or running in kiosk app session.
   return !Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
-         !Shell::GetInstance()->IsSystemModalWindowOpen();
+         !Shell::GetInstance()->IsSystemModalWindowOpen() &&
+         Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() !=
+             user::LOGGED_IN_KIOSK_APP;
 }
 
 void WindowSelectorController::ToggleOverview() {
   if (IsSelecting()) {
     OnSelectionCanceled();
   } else {
+    // Don't start overview if window selection is not allowed.
+    if (!CanSelect())
+      return;
+
     std::vector<aura::Window*> windows = ash::Shell::GetInstance()->
         mru_window_tracker()->BuildMruWindowList();
     // Don't enter overview mode with no windows.
@@ -68,19 +78,22 @@ bool WindowSelectorController::IsSelecting() {
 }
 
 void WindowSelectorController::OnWindowSelected(aura::Window* window) {
-  window_selector_.reset();
   wm::ActivateWindow(window);
+  window_selector_.reset();
   last_selection_time_ = base::Time::Now();
+  Shell::GetInstance()->mru_window_tracker()->SetIgnoreActivations(false);
 }
 
 void WindowSelectorController::OnSelectionCanceled() {
   window_selector_.reset();
   last_selection_time_ = base::Time::Now();
+  Shell::GetInstance()->mru_window_tracker()->SetIgnoreActivations(false);
 }
 
 void WindowSelectorController::OnSelectionStarted() {
+  Shell::GetInstance()->mru_window_tracker()->SetIgnoreActivations(true);
   Shell* shell = Shell::GetInstance();
-  shell->delegate()->RecordUserMetricsAction(UMA_WINDOW_SELECTION);
+  shell->metrics()->RecordUserMetricsAction(UMA_WINDOW_SELECTION);
   if (!last_selection_time_.is_null()) {
     UMA_HISTOGRAM_LONG_TIMES(
         "Ash.WindowSelector.TimeBetweenUse",