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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
Index: chrome/browser/ui/cocoa/accelerators_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm
index 8410dbe013ee6465d4d98450d9f0247141bbbb2d..5be8e10817d9539b431ecf6650090feadec849af 100644
--- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm
+++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm
@@ -106,7 +106,7 @@ const struct AcceleratorMapping {
// Create a Cocoa platform accelerator given a cross platform |key_code| and
// the |cocoa_modifiers|.
-scoped_ptr<ui::PlatformAccelerator> PlatformAcceleratorFromKeyCode(
+std::unique_ptr<ui::PlatformAccelerator> PlatformAcceleratorFromKeyCode(
ui::KeyboardCode key_code,
NSUInteger cocoa_modifiers) {
unichar shifted_character;
@@ -116,7 +116,7 @@ scoped_ptr<ui::PlatformAccelerator> PlatformAcceleratorFromKeyCode(
NSString* key_equivalent =
[NSString stringWithFormat:@"%C", shifted_character];
- return scoped_ptr<ui::PlatformAccelerator>(
+ return std::unique_ptr<ui::PlatformAccelerator>(
new ui::PlatformAcceleratorCocoa(key_equivalent, cocoa_modifiers));
}
@@ -127,7 +127,7 @@ ui::Accelerator AcceleratorFromKeyCode(ui::KeyboardCode key_code,
int cross_platform_modifiers = ui::EventFlagsFromModifiers(cocoa_modifiers);
ui::Accelerator accelerator(key_code, cross_platform_modifiers);
- scoped_ptr<ui::PlatformAccelerator> platform_accelerator =
+ std::unique_ptr<ui::PlatformAccelerator> platform_accelerator =
PlatformAcceleratorFromKeyCode(key_code, cocoa_modifiers);
accelerator.set_platform_accelerator(std::move(platform_accelerator));
return accelerator;
« no previous file with comments | « chrome/browser/ui/chrome_select_file_policy_unittest.cc ('k') | chrome/browser/ui/cocoa/app_menu/app_menu_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698