chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm - Issue 856253002: Bug fix for the pointer lock string problem

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 856253002: Bug fix for the pointer lock string problem (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove debugging printouts Created 5 years, 11 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/nibs/ExclusiveAccessBubble.xib ('k') | chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 d6c0de1689d19206affeb70769be10d861a2380a..e990cff6970eb66c0b03bc29b5f1988a023ab13a 100644

--- a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm

+++ b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm

@@ -258,6 +258,17 @@ const float kHideDuration = 0.7;

labelFrame.origin.x += NSWidth(labelFrame) - NSWidth(textFrame);

labelFrame.size = textFrame.size;

[exitLabel_ setFrame:labelFrame];

+ // Update the title of denyButton_ according to the current bubbleType_

+ if (bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS ||

+ bubbleType_ ==

+ EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS ||

+ bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS) {

+ NSString* denyButtonText =

+ SysUTF16ToNSString(

+ exclusive_access_bubble::GetDenyButtonTextForType(bubbleType_));

+ [denyButton_ setTitle: denyButtonText];

Avi (use Gerrit) 2015/01/27 19:27:12 no space after :

Jialiu Lin 2015/01/27 19:51:09 Done.

+ }

}

- (NSString*)getLabelText {