| Index: chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc
|
| diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc
|
| deleted file mode 100644
|
| index ffd5d0a2bb3a28a142c5ad4741b4e0a5bec2a208..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc
|
| +++ /dev/null
|
| @@ -1,149 +0,0 @@
|
| -// 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/fullscreen/fullscreen_exit_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/browser.h"
|
| -#include "chrome/browser/ui/browser_commands.h"
|
| -#include "chrome/browser/ui/fullscreen/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/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 FullscreenExitBubble::kPaddingPx = 8;
|
| -#else
|
| -const int FullscreenExitBubble::kPaddingPx = 15;
|
| -#endif
|
| -const int FullscreenExitBubble::kInitialDelayMs = 3800;
|
| -const int FullscreenExitBubble::kIdleTimeMs = 2300;
|
| -const int FullscreenExitBubble::kPositionCheckHz = 10;
|
| -const int FullscreenExitBubble::kSlideInRegionHeightPx = 4;
|
| -const int FullscreenExitBubble::kSlideInDurationMs = 350;
|
| -const int FullscreenExitBubble::kSlideOutDurationMs = 700;
|
| -const int FullscreenExitBubble::kPopupTopPx = 15;
|
| -
|
| -FullscreenExitBubble::FullscreenExitBubble(Browser* browser,
|
| - const GURL& url,
|
| - FullscreenExitBubbleType bubble_type)
|
| - : browser_(browser),
|
| - url_(url),
|
| - bubble_type_(bubble_type) {
|
| - DCHECK_NE(FEB_TYPE_NONE, bubble_type_);
|
| -}
|
| -
|
| -FullscreenExitBubble::~FullscreenExitBubble() {
|
| -}
|
| -
|
| -void FullscreenExitBubble::StartWatchingMouse() {
|
| - // Start the initial delay timer and begin watching the mouse.
|
| - initial_delay_.Start(FROM_HERE,
|
| - base::TimeDelta::FromMilliseconds(kInitialDelayMs), this,
|
| - &FullscreenExitBubble::CheckMousePosition);
|
| - gfx::Point cursor_pos = GetCursorScreenPoint();
|
| - last_mouse_pos_ = cursor_pos;
|
| - mouse_position_checker_.Start(FROM_HERE,
|
| - base::TimeDelta::FromMilliseconds(1000 / kPositionCheckHz), this,
|
| - &FullscreenExitBubble::CheckMousePosition);
|
| -}
|
| -
|
| -void FullscreenExitBubble::StopWatchingMouse() {
|
| - initial_delay_.Stop();
|
| - idle_timeout_.Stop();
|
| - mouse_position_checker_.Stop();
|
| -}
|
| -
|
| -bool FullscreenExitBubble::IsWatchingMouse() const {
|
| - return mouse_position_checker_.IsRunning();
|
| -}
|
| -
|
| -void FullscreenExitBubble::CheckMousePosition() {
|
| - // Desired behavior:
|
| - //
|
| - // +------------+-----------------------------+------------+
|
| - // | _ _ _ _ | Exit full screen mode (F11) | _ _ _ _ | Slide-in region
|
| - // | _ _ _ _ \_____________________________/ _ _ _ _ | Neutral region
|
| - // | | Slide-out region
|
| - // : :
|
| - //
|
| - // * If app is not active, we hide the popup.
|
| - // * If the mouse is offscreen or in the slide-out region, we hide the popup.
|
| - // * If the mouse goes idle, we hide the popup.
|
| - // * If the mouse is in the slide-in-region and not idle, we show the popup.
|
| - // * If the mouse is in the neutral region and not idle, and the popup is
|
| - // currently sliding out, we show it again. This facilitates users
|
| - // correcting us if they try to mouse horizontally towards the popup and
|
| - // unintentionally drop too low.
|
| - // * Otherwise, we do nothing, because the mouse is in the neutral region and
|
| - // either the popup is hidden or the mouse is not idle, so we don't want to
|
| - // change anything's state.
|
| -
|
| - 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,
|
| - &FullscreenExitBubble::CheckMousePosition);
|
| - }
|
| - 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()) {
|
| - 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();
|
| - }
|
| -}
|
| -
|
| -void FullscreenExitBubble::ToggleFullscreen() {
|
| - browser_->fullscreen_controller()->
|
| - ExitTabOrBrowserFullscreenToPreviousState();
|
| -}
|
| -
|
| -void FullscreenExitBubble::Accept() {
|
| - browser_->fullscreen_controller()->OnAcceptFullscreenPermission();
|
| -}
|
| -
|
| -void FullscreenExitBubble::Cancel() {
|
| - browser_->fullscreen_controller()->OnDenyFullscreenPermission();
|
| -}
|
| -
|
| -base::string16 FullscreenExitBubble::GetCurrentMessageText() const {
|
| - return fullscreen_bubble::GetLabelTextForType(
|
| - bubble_type_, url_,
|
| - extensions::ExtensionRegistry::Get(browser_->profile()));
|
| -}
|
| -
|
| -base::string16 FullscreenExitBubble::GetCurrentDenyButtonText() const {
|
| - return fullscreen_bubble::GetDenyButtonTextForType(bubble_type_);
|
| -}
|
| -
|
| -base::string16 FullscreenExitBubble::GetAllowButtonText() const {
|
| - return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW);
|
| -}
|
| -
|
| -base::string16 FullscreenExitBubble::GetInstructionText() const {
|
| - return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,
|
| - l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));
|
| -}
|
|
|