Change exclusive access popup behaviour with simplified-fullscreen-ui.

chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc

 // Copyright (c) 2012 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/ui/exclusive_access/exclusive_access_bubble.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/browser/extension_registry.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/strings/grit/ui_strings.h"
 
 // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
 // here.
 #if defined(OS_LINUX)
 const int ExclusiveAccessBubble::kPaddingPx = 8;
 #else
 const int ExclusiveAccessBubble::kPaddingPx = 15;
 #endif
 const int ExclusiveAccessBubble::kInitialDelayMs = 3800;
 const int ExclusiveAccessBubble::kIdleTimeMs = 2300;
+const int ExclusiveAccessBubble::kInitialDebounceTimeMs = 500;

[msw, 2015/08/04 18:21:50]

nit: rename this |kInitialNotifyTimeMs| to match |kRenotifyTimeMs|

[Matt Giuca, 2015/08/05 03:27:20]

Since scheib told me to rename kRenotifyTimeMs, I'm calling this
kDebounceNotificationsTimeMs (to match kSnoozeNotificationsTimeMs).

+const int ExclusiveAccessBubble::kRenotifyTimeMs = 60000;  // 1 minute.
 const int ExclusiveAccessBubble::kPositionCheckHz = 10;
 const int ExclusiveAccessBubble::kSlideInRegionHeightPx = 4;
 const int ExclusiveAccessBubble::kSlideInDurationMs = 350;
 const int ExclusiveAccessBubble::kSlideOutDurationMs = 700;
 const int ExclusiveAccessBubble::kPopupTopPx = 15;
 
 ExclusiveAccessBubble::ExclusiveAccessBubble(
     ExclusiveAccessManager* manager,
     const GURL& url,
     ExclusiveAccessBubbleType bubble_type)
     : manager_(manager), url_(url), bubble_type_(bubble_type) {
   DCHECK_NE(EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE, bubble_type_);
+
+  // Wait for a short time to let the user stop moving the mouse. After this
+  // time elapses, we will notify the user upon the next mouse/keyboard input.

[msw, 2015/08/04 18:21:51]

nit: no keyboard...

[Matt Giuca, 2015/08/05 03:27:20]

Done.

+  if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
+    aggressive_notify_timeout_.Start(
+        FROM_HERE, base::TimeDelta::FromMilliseconds(kInitialDebounceTimeMs),
+        this, &ExclusiveAccessBubble::CheckMousePosition);
+  }
 }
 
 ExclusiveAccessBubble::~ExclusiveAccessBubble() {
 }
 
 void ExclusiveAccessBubble::StartWatchingMouse() {
   // Start the initial delay timer and begin watching the mouse.

[msw, 2015/08/04 18:21:50]

nit: update comment ('initial delay')?

[Matt Giuca, 2015/08/05 03:27:19]

I think this comment is OK (we are using hide_timeout_ as an initial delay timer
in this context).

-  initial_delay_.Start(FROM_HERE,
-                       base::TimeDelta::FromMilliseconds(kInitialDelayMs), this,
-                       &ExclusiveAccessBubble::CheckMousePosition);
+  if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
+    hide_timeout_.Start(FROM_HERE,
+                        base::TimeDelta::FromMilliseconds(kInitialDelayMs),
+                        this, &ExclusiveAccessBubble::CheckMousePosition);
+  }
   gfx::Point cursor_pos = GetCursorScreenPoint();
   last_mouse_pos_ = cursor_pos;
   mouse_position_checker_.Start(
       FROM_HERE, base::TimeDelta::FromMilliseconds(1000 / kPositionCheckHz),
       this, &ExclusiveAccessBubble::CheckMousePosition);
 }
 
 void ExclusiveAccessBubble::StopWatchingMouse() {
-  initial_delay_.Stop();
+  hide_timeout_.Stop();
   idle_timeout_.Stop();
   mouse_position_checker_.Stop();
 }
 
 bool ExclusiveAccessBubble::IsWatchingMouse() const {
   return mouse_position_checker_.IsRunning();
 }
 
 void ExclusiveAccessBubble::CheckMousePosition() {
   // Desired behavior:
@@ skipping 18 matching lines @@
 
   gfx::Point cursor_pos = GetCursorScreenPoint();
 
   // Check to see whether the mouse is idle.
   if (cursor_pos != last_mouse_pos_) {
     // The mouse moved; reset the idle timer.
     idle_timeout_.Stop();  // If the timer isn't running, this is a no-op.
     idle_timeout_.Start(FROM_HERE,
                         base::TimeDelta::FromMilliseconds(kIdleTimeMs), this,
                         &ExclusiveAccessBubble::CheckMousePosition);
+
+    if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
+      // If the aggressive notification timer has elapsed, show the notification
+      // regardless of where the mouse is on the screen.
+      if (!aggressive_notify_timeout_.IsRunning()) {
+        Show();
+        // Do not allow the notification to hide for a few seconds.
+        hide_timeout_.Start(FROM_HERE,
+                            base::TimeDelta::FromMilliseconds(kIdleTimeMs),
+                            this, &ExclusiveAccessBubble::CheckMousePosition);
+        // Do not aggressively show the notification again until a long time has

[msw, 2015/08/04 18:21:50]

nit: remove 'aggressively', maybe rephrase to something like "Wait a long time
before again showing the notification regardless of mouse position."

[Matt Giuca, 2015/08/05 03:27:19]

Done.

+        // elapsed.
+        aggressive_notify_timeout_.Start(
+            FROM_HERE, base::TimeDelta::FromMilliseconds(kRenotifyTimeMs), this,
+            &ExclusiveAccessBubble::CheckMousePosition);
+        return;
+      } else {
+        // The timer has not elapsed, but the user moved the mouse. Reset the
+        // timer. (We only want to re-show the message after a period of
+        // inactivity.)
+        aggressive_notify_timeout_.Reset();
+      }
+    }
   }
   last_mouse_pos_ = cursor_pos;
 
   if (!IsWindowActive() || !WindowContainsPoint(cursor_pos) ||
       (cursor_pos.y() >= GetPopupRect(true).bottom()) ||
       !idle_timeout_.IsRunning()) {
     // The cursor is offscreen, in the slide-out region, or idle.
-    if (!initial_delay_.IsRunning()) {
+    if (!hide_timeout_.IsRunning()) {
       Hide();
     }
   } else if (cursor_pos.y() < kSlideInRegionHeightPx &&
              CanMouseTriggerSlideIn()) {
     Show();
   } else if (IsAnimating()) {
     // The cursor is not idle and either it's in the slide-in region or it's in
     // the neutral region and we're sliding in or out.
     Show();
   }
@@ skipping 22 matching lines @@
 }
 
 base::string16 ExclusiveAccessBubble::GetCurrentAllowButtonText() const {
   return exclusive_access_bubble::GetAllowButtonTextForType(bubble_type_, url_);
 }
 
 base::string16 ExclusiveAccessBubble::GetInstructionText() const {
   return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,
                                     l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));
 }