| Index: chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h
|
| diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h b/chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h
|
| similarity index 45%
|
| rename from chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h
|
| rename to chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h
|
| index d36d122b5ef8d9bb284816b8731e6ad54fbd4180..4a292aab0eb71b0efe0a0019b53b2c2459bd43f0 100644
|
| --- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h
|
| +++ b/chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_EXIT_BUBBLE_TYPE_H_
|
| -#define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_EXIT_BUBBLE_TYPE_H_
|
| +#ifndef CHROME_BROWSER_UI_FULLSCREEN_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_
|
| +#define CHROME_BROWSER_UI_FULLSCREEN_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_
|
|
|
| #include "base/strings/string16.h"
|
| #include "url/gurl.h"
|
| @@ -16,35 +16,35 @@ class ExtensionRegistry;
|
| // For example, if the user already agreed to fullscreen mode and the
|
| // web page then requests mouse lock, "do you want to allow mouse lock"
|
| // will be shown.
|
| -enum FullscreenExitBubbleType {
|
| - FEB_TYPE_NONE = 0,
|
| +enum ExclusiveAccessBubbleType {
|
| + EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE = 0,
|
|
|
| // For tab fullscreen mode.
|
| // More comments about tab and browser fullscreen mode can be found in
|
| // chrome/browser/ui/fullscreen/fullscreen_controller.h.
|
| - FEB_TYPE_FULLSCREEN_BUTTONS,
|
| - FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS,
|
| - FEB_TYPE_MOUSELOCK_BUTTONS,
|
| - FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION,
|
| - FEB_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION,
|
| - FEB_TYPE_MOUSELOCK_EXIT_INSTRUCTION,
|
| + EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS,
|
| + EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS,
|
| + EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS,
|
| + EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION,
|
| + EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION,
|
| + EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION,
|
|
|
| // For browser fullscreen mode.
|
| - FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION,
|
| - FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION
|
| + EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION,
|
| + EXCLUSIVE_ACCESS_BUBBLE_TYPE_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION
|
| };
|
|
|
| -namespace fullscreen_bubble {
|
| +namespace exclusive_access_bubble {
|
|
|
| -base::string16 GetLabelTextForType(FullscreenExitBubbleType type,
|
| +base::string16 GetLabelTextForType(ExclusiveAccessBubbleType type,
|
| const GURL& url,
|
| extensions::ExtensionRegistry* registry);
|
| -base::string16 GetDenyButtonTextForType(FullscreenExitBubbleType type);
|
| -bool ShowButtonsForType(FullscreenExitBubbleType type);
|
| -void PermissionRequestedByType(FullscreenExitBubbleType type,
|
| +base::string16 GetDenyButtonTextForType(ExclusiveAccessBubbleType type);
|
| +bool ShowButtonsForType(ExclusiveAccessBubbleType type);
|
| +void PermissionRequestedByType(ExclusiveAccessBubbleType type,
|
| bool* tab_fullscreen,
|
| bool* mouse_lock);
|
|
|
| -} // namespace fullscreen_bubble
|
| +} // namespace exclusive_access_bubble
|
|
|
| -#endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_EXIT_BUBBLE_TYPE_H_
|
| +#endif // CHROME_BROWSER_UI_FULLSCREEN_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_
|
|
|