| Index: chrome/browser/ui/fullscreen_exit_bubble_type.cc
|
| diff --git a/chrome/browser/ui/fullscreen_exit_bubble_type.cc b/chrome/browser/ui/fullscreen_exit_bubble_type.cc
|
| index e03425fa603c6e5d9e1cd94479b416558f674ce7..35498f0d3a53b31a7e326b027e9a8e98c1a67881 100644
|
| --- a/chrome/browser/ui/fullscreen_exit_bubble_type.cc
|
| +++ b/chrome/browser/ui/fullscreen_exit_bubble_type.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| @@ -55,22 +55,25 @@ string16 GetLabelTextForType(FullscreenExitBubbleType type,
|
| IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN, host);
|
| case FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS:
|
| return l10n_util::GetStringFUTF16(
|
| - IDS_FULLSCREEN_SITE_REQUEST_FULLSCREEN_MOUSELOCK, host);
|
| + IDS_FULLSCREEN_SITE_REQUEST_FULLSCREEN_MOUSELOCK, host);
|
| case FEB_TYPE_MOUSELOCK_BUTTONS:
|
| return l10n_util::GetStringFUTF16(
|
| - IDS_FULLSCREEN_SITE_REQUEST_MOUSELOCK, host);
|
| + IDS_FULLSCREEN_SITE_REQUEST_MOUSELOCK, host);
|
| case FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION:
|
| return l10n_util::GetStringFUTF16(
|
| - IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN, host);
|
| + IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN, host);
|
| case FEB_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION:
|
| return l10n_util::GetStringFUTF16(
|
| IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN_MOUSELOCK, host);
|
| case FEB_TYPE_MOUSELOCK_EXIT_INSTRUCTION:
|
| return l10n_util::GetStringFUTF16(
|
| - IDS_FULLSCREEN_SITE_ENTERED_MOUSELOCK, host);
|
| + IDS_FULLSCREEN_SITE_ENTERED_MOUSELOCK, host);
|
| case FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:
|
| return l10n_util::GetStringUTF16(
|
| IDS_FULLSCREEN_USER_ENTERED_FULLSCREEN);
|
| + case FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION:
|
| + return l10n_util::GetStringFUTF16(
|
| + IDS_FULLSCREEN_EXTENSION_TRIGGERED_FULLSCREEN, host);
|
| default:
|
| NOTREACHED();
|
| return string16();
|
| @@ -89,6 +92,7 @@ string16 GetDenyButtonTextForType(FullscreenExitBubbleType type) {
|
| case FEB_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION:
|
| case FEB_TYPE_MOUSELOCK_EXIT_INSTRUCTION:
|
| case FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:
|
| + case FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION:
|
| NOTREACHED(); // No button in this case.
|
| return string16();
|
| default:
|
| @@ -99,8 +103,8 @@ string16 GetDenyButtonTextForType(FullscreenExitBubbleType type) {
|
|
|
| bool ShowButtonsForType(FullscreenExitBubbleType type) {
|
| return type == FEB_TYPE_FULLSCREEN_BUTTONS ||
|
| - type == FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS ||
|
| - type == FEB_TYPE_MOUSELOCK_BUTTONS;
|
| + type == FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS ||
|
| + type == FEB_TYPE_MOUSELOCK_BUTTONS;
|
| }
|
|
|
| void PermissionRequestedByType(FullscreenExitBubbleType type,
|
| @@ -108,11 +112,11 @@ void PermissionRequestedByType(FullscreenExitBubbleType type,
|
| bool* mouse_lock) {
|
| if (tab_fullscreen) {
|
| *tab_fullscreen = type == FEB_TYPE_FULLSCREEN_BUTTONS ||
|
| - type == FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS;
|
| + type == FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS;
|
| }
|
| if (mouse_lock) {
|
| *mouse_lock = type == FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS ||
|
| - type == FEB_TYPE_MOUSELOCK_BUTTONS;
|
| + type == FEB_TYPE_MOUSELOCK_BUTTONS;
|
| }
|
| }
|
|
|
|
|