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

Unified Diff: chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm

Issue 903683005: Always prompt for permission on fullscreen and mouse lock on file:// URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak unit test Created 5 years, 10 months 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/app/generated_resources.grd ('k') | chrome/browser/ui/exclusive_access/exclusive_access_bubble.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm
index c7e523766884e56c90d3c24050bc0e6a92d03ed1..06d8e85cb6f0a41898c6df06ccf256878029842c 100644
--- a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm
+++ b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm
@@ -262,13 +262,16 @@ const float kHideDuration = 0.7;
labelFrame.size = textFrame.size;
[exitLabel_ setFrame:labelFrame];
- // Update the title of denyButton_ according to the current bubbleType_,
- // or show no button at all.
+ // Update the title of |allowButton_| and |denyButton_| according to the
+ // current |bubbleType_|, or show no button at all.
if (exclusive_access_bubble::ShowButtonsForType(bubbleType_)) {
NSString* denyButtonText =
SysUTF16ToNSString(
exclusive_access_bubble::GetDenyButtonTextForType(bubbleType_));
[denyButton_ setTitle:denyButtonText];
+ NSString* allowButtonText = SysUTF16ToNSString(
+ exclusive_access_bubble::GetAllowButtonTextForType(bubbleType_, url_));
+ [allowButton_ setTitle:allowButtonText];
} else {
[self showButtons:NO];
}
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/exclusive_access/exclusive_access_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698