Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1408)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/fullscreen/exclusive_access_bubble_type.cc

Issue 789403002: Rename fullscreen_exit_bubble_* to exclusive_access_bubble_* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated based on CR comments Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h ('k') | chrome/browser/ui/fullscreen/fullscreen_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/fullscreen/exclusive_access_bubble_type.cc
diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc b/chrome/browser/ui/fullscreen/exclusive_access_bubble_type.cc
similarity index 45%
rename from chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc
rename to chrome/browser/ui/fullscreen/exclusive_access_bubble_type.cc
index 0c8c076aa20639a44e42e15f5588491873b47f9e..f52bf87290811584f32c4ac699ca81c5145c57c3 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc
+++ b/chrome/browser/ui/fullscreen/exclusive_access_bubble_type.cc
@@ -2,7 +2,7 @@
// 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_type.h"
+#include "chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/url_constants.h"
@@ -13,9 +13,9 @@
#include "extensions/common/extension_set.h"
#include "ui/base/l10n/l10n_util.h"
-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 host(base::UTF8ToUTF16(url.host()));
@@ -32,24 +32,23 @@ base::string16 GetLabelTextForType(FullscreenExitBubbleType type,
}
if (host.empty()) {
switch (type) {
- case FEB_TYPE_FULLSCREEN_BUTTONS:
- case FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION:
return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ENTERED_FULLSCREEN);
- case FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS:
return l10n_util::GetStringUTF16(
IDS_FULLSCREEN_REQUEST_FULLSCREEN_MOUSELOCK);
- case FEB_TYPE_MOUSELOCK_BUTTONS:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS:
return l10n_util::GetStringUTF16(IDS_FULLSCREEN_REQUEST_MOUSELOCK);
- case FEB_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION:
return l10n_util::GetStringUTF16(
IDS_FULLSCREEN_ENTERED_FULLSCREEN_MOUSELOCK);
- case FEB_TYPE_MOUSELOCK_EXIT_INSTRUCTION:
- return l10n_util::GetStringUTF16(
- IDS_FULLSCREEN_ENTERED_MOUSELOCK);
- case FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION:
+ return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ENTERED_MOUSELOCK);
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:
return l10n_util::GetStringUTF16(
IDS_FULLSCREEN_USER_ENTERED_FULLSCREEN);
- case FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION:
return l10n_util::GetStringUTF16(
IDS_FULLSCREEN_UNKNOWN_EXTENSION_TRIGGERED_FULLSCREEN);
default:
@@ -58,28 +57,27 @@ base::string16 GetLabelTextForType(FullscreenExitBubbleType type,
}
}
switch (type) {
- case FEB_TYPE_FULLSCREEN_BUTTONS:
- return l10n_util::GetStringFUTF16(
- IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN, host);
- case FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS:
+ return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN,
+ host);
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS:
return l10n_util::GetStringFUTF16(
IDS_FULLSCREEN_SITE_REQUEST_FULLSCREEN_MOUSELOCK, host);
- case FEB_TYPE_MOUSELOCK_BUTTONS:
- return l10n_util::GetStringFUTF16(
- IDS_FULLSCREEN_SITE_REQUEST_MOUSELOCK, host);
- case FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION:
- return l10n_util::GetStringFUTF16(
- IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN, host);
- case FEB_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS:
+ return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_SITE_REQUEST_MOUSELOCK,
+ host);
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION:
+ return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN,
+ host);
+ case EXCLUSIVE_ACCESS_BUBBLE_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);
- case FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:
- return l10n_util::GetStringUTF16(
- IDS_FULLSCREEN_USER_ENTERED_FULLSCREEN);
- case FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION:
+ return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_SITE_ENTERED_MOUSELOCK,
+ host);
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:
+ return l10n_util::GetStringUTF16(IDS_FULLSCREEN_USER_ENTERED_FULLSCREEN);
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION:
return l10n_util::GetStringFUTF16(
IDS_FULLSCREEN_EXTENSION_TRIGGERED_FULLSCREEN, host);
default:
@@ -88,19 +86,19 @@ base::string16 GetLabelTextForType(FullscreenExitBubbleType type,
}
}
-base::string16 GetDenyButtonTextForType(FullscreenExitBubbleType type) {
+base::string16 GetDenyButtonTextForType(ExclusiveAccessBubbleType type) {
switch (type) {
- case FEB_TYPE_FULLSCREEN_BUTTONS:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS:
return l10n_util::GetStringUTF16(IDS_FULLSCREEN_EXIT_FULLSCREEN);
- case FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS:
return l10n_util::GetStringUTF16(IDS_FULLSCREEN_EXIT);
- case FEB_TYPE_MOUSELOCK_BUTTONS:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS:
return l10n_util::GetStringUTF16(IDS_FULLSCREEN_DENY);
- case FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION:
- 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:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:
+ case EXCLUSIVE_ACCESS_BUBBLE_TYPE_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION:
NOTREACHED(); // No button in this case.
return base::string16();
default:
@@ -109,23 +107,25 @@ base::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;
+bool ShowButtonsForType(ExclusiveAccessBubbleType type) {
+ return type == EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS ||
+ type == EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS ||
+ type == EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS;
}
-void PermissionRequestedByType(FullscreenExitBubbleType type,
+void PermissionRequestedByType(ExclusiveAccessBubbleType type,
bool* tab_fullscreen,
bool* mouse_lock) {
if (tab_fullscreen) {
- *tab_fullscreen = type == FEB_TYPE_FULLSCREEN_BUTTONS ||
- type == FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS;
+ *tab_fullscreen =
+ type == EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS ||
+ type == EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS;
}
if (mouse_lock) {
- *mouse_lock = type == FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS ||
- type == FEB_TYPE_MOUSELOCK_BUTTONS;
+ *mouse_lock =
+ type == EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS ||
+ type == EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS;
}
}
-} // namespace fullscreen_bubble
+} // namespace exclusive_access_bubble
« no previous file with comments | « chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h ('k') | chrome/browser/ui/fullscreen/fullscreen_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698