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

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

Issue 1579863003: Convert Pass()→std::move() for Mac build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/ui/cocoa/accelerators_cocoa.h" 5 #include "chrome/browser/ui/cocoa/accelerators_cocoa.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <utility>
11
10 #include "base/logging.h" 12 #include "base/logging.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/singleton.h" 14 #include "base/memory/singleton.h"
13 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
14 #import "ui/base/accelerators/platform_accelerator_cocoa.h" 16 #import "ui/base/accelerators/platform_accelerator_cocoa.h"
15 #import "ui/events/cocoa/cocoa_event_utils.h" 17 #import "ui/events/cocoa/cocoa_event_utils.h"
16 #import "ui/events/keycodes/keyboard_code_conversion_mac.h" 18 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
17 19
18 namespace { 20 namespace {
19 21
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 122
121 // Create a cross platform accelerator given a cross platform |key_code| and 123 // Create a cross platform accelerator given a cross platform |key_code| and
122 // the |cocoa_modifiers|. 124 // the |cocoa_modifiers|.
123 ui::Accelerator AcceleratorFromKeyCode(ui::KeyboardCode key_code, 125 ui::Accelerator AcceleratorFromKeyCode(ui::KeyboardCode key_code,
124 NSUInteger cocoa_modifiers) { 126 NSUInteger cocoa_modifiers) {
125 int cross_platform_modifiers = ui::EventFlagsFromModifiers(cocoa_modifiers); 127 int cross_platform_modifiers = ui::EventFlagsFromModifiers(cocoa_modifiers);
126 ui::Accelerator accelerator(key_code, cross_platform_modifiers); 128 ui::Accelerator accelerator(key_code, cross_platform_modifiers);
127 129
128 scoped_ptr<ui::PlatformAccelerator> platform_accelerator = 130 scoped_ptr<ui::PlatformAccelerator> platform_accelerator =
129 PlatformAcceleratorFromKeyCode(key_code, cocoa_modifiers); 131 PlatformAcceleratorFromKeyCode(key_code, cocoa_modifiers);
130 accelerator.set_platform_accelerator(platform_accelerator.Pass()); 132 accelerator.set_platform_accelerator(std::move(platform_accelerator));
131 return accelerator; 133 return accelerator;
132 } 134 }
133 135
134 } // namespace 136 } // namespace
135 137
136 AcceleratorsCocoa::AcceleratorsCocoa() { 138 AcceleratorsCocoa::AcceleratorsCocoa() {
137 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) { 139 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
138 const AcceleratorMapping& entry = kAcceleratorMap[i]; 140 const AcceleratorMapping& entry = kAcceleratorMap[i];
139 ui::Accelerator accelerator = 141 ui::Accelerator accelerator =
140 AcceleratorFromKeyCode(entry.key_code, entry.modifiers); 142 AcceleratorFromKeyCode(entry.key_code, entry.modifiers);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 NSUInteger mask = platform_accelerator->modifier_mask(); 186 NSUInteger mask = platform_accelerator->modifier_mask();
185 BOOL maskEqual = 187 BOOL maskEqual =
186 (mask == modifiers) || ((mask & (~NSShiftKeyMask)) == modifiers); 188 (mask == modifiers) || ((mask & (~NSShiftKeyMask)) == modifiers);
187 NSString* string = [NSString stringWithFormat:@"%C", shifted_character]; 189 NSString* string = [NSString stringWithFormat:@"%C", shifted_character];
188 if ([string isEqual:key_equivalent] && maskEqual) 190 if ([string isEqual:key_equivalent] && maskEqual)
189 return &*it; 191 return &*it;
190 } 192 }
191 193
192 return NULL; 194 return NULL;
193 } 195 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_mac.mm ('k') | chrome/browser/ui/cocoa/autofill/layout_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698