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

Side by Side Diff: chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm

Issue 1421813005: Fullscreen bubble: Draw a white box around "ESC" in "Press ESC to exit". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@border-roundedrect
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/logging.h" // for NOTREACHED() 7 #include "base/logging.h" // for NOTREACHED()
8 #include "base/mac/bundle_locations.h" 8 #include "base/mac/bundle_locations.h"
9 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 [exitLabel_.get() setDelegate:self]; 217 [exitLabel_.get() setDelegate:self];
218 218
219 NSString* exitLinkText; 219 NSString* exitLinkText;
220 NSString* exitLinkedText; 220 NSString* exitLinkedText;
221 if (bubbleType_ == 221 if (bubbleType_ ==
222 EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION || 222 EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION ||
223 bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION) { 223 bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION) {
224 exitLinkText = @""; 224 exitLinkText = @"";
225 exitLinkedText = 225 exitLinkedText =
226 [@" " stringByAppendingString:l10n_util::GetNSStringF( 226 [@" " stringByAppendingString:l10n_util::GetNSStringF(
227 IDS_FULLSCREEN_PRESS_ESC_TO_EXIT, 227 IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_SENTENCE,
228 l10n_util::GetStringUTF16( 228 l10n_util::GetStringUTF16(
229 IDS_APP_ESC_KEY))]; 229 IDS_APP_ESC_KEY))];
230 } else { 230 } else {
231 exitLinkText = l10n_util::GetNSString(IDS_EXIT_FULLSCREEN_MODE); 231 exitLinkText = l10n_util::GetNSString(IDS_EXIT_FULLSCREEN_MODE);
232 NSString* messageText = l10n_util::GetNSStringF( 232 NSString* messageText = l10n_util::GetNSStringF(
233 IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR, 233 IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR,
234 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY)); 234 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));
235 exitLinkedText = 235 exitLinkedText =
236 [NSString stringWithFormat:@"%@ %@", exitLinkText, messageText]; 236 [NSString stringWithFormat:@"%@ %@", exitLinkText, messageText];
237 } 237 }
238 238
239 NSFont* font = [NSFont 239 NSFont* font = [NSFont
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 - (void)hideSoon { 343 - (void)hideSoon {
344 hideTimer_.reset( 344 hideTimer_.reset(
345 [[NSTimer scheduledTimerWithTimeInterval:kInitialDelay 345 [[NSTimer scheduledTimerWithTimeInterval:kInitialDelay
346 target:self 346 target:self
347 selector:@selector(hideTimerFired:) 347 selector:@selector(hideTimerFired:)
348 userInfo:nil 348 userInfo:nil
349 repeats:NO] retain]); 349 repeats:NO] retain]);
350 } 350 }
351 351
352 @end 352 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698