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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 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 #import <QuartzCore/QuartzCore.h> 6 #import <QuartzCore/QuartzCore.h>
7 7
8 #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h" 8 #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h"
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/mac/scoped_nsobject.h" 11 #include "base/mac/scoped_nsobject.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/prefs/pref_registry_simple.h"
14 #include "base/strings/sys_string_conversions.h" 13 #include "base/strings/sys_string_conversions.h"
15 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
18 #include "chrome/browser/ui/browser_finder.h" 17 #include "chrome/browser/ui/browser_finder.h"
19 #include "chrome/browser/ui/cocoa/confirm_quit.h" 18 #include "chrome/browser/ui/cocoa/confirm_quit.h"
20 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
21 #include "chrome/grit/generated_resources.h" 20 #include "chrome/grit/generated_resources.h"
21 #include "components/prefs/pref_registry_simple.h"
22 #import "ui/base/accelerators/platform_accelerator_cocoa.h" 22 #import "ui/base/accelerators/platform_accelerator_cocoa.h"
23 #include "ui/base/l10n/l10n_util_mac.h" 23 #include "ui/base/l10n/l10n_util_mac.h"
24 24
25 // Constants /////////////////////////////////////////////////////////////////// 25 // Constants ///////////////////////////////////////////////////////////////////
26 26
27 // How long the user must hold down Cmd+Q to confirm the quit. 27 // How long the user must hold down Cmd+Q to confirm the quit.
28 const NSTimeInterval kTimeToConfirmQuit = 1.5; 28 const NSTimeInterval kTimeToConfirmQuit = 1.5;
29 29
30 // Leeway between the |targetDate| and the current time that will confirm a 30 // Leeway between the |targetDate| and the current time that will confirm a
31 // quit. 31 // quit.
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 if (modifiers & NSAlternateKeyMask) 417 if (modifiers & NSAlternateKeyMask)
418 [string appendString:@"\u2325"]; 418 [string appendString:@"\u2325"];
419 if (modifiers & NSShiftKeyMask) 419 if (modifiers & NSShiftKeyMask)
420 [string appendString:@"\u21E7"]; 420 [string appendString:@"\u21E7"];
421 421
422 [string appendString:[item.characters() uppercaseString]]; 422 [string appendString:[item.characters() uppercaseString]];
423 return string; 423 return string;
424 } 424 }
425 425
426 @end 426 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698