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

Side by Side Diff: ui/base/accelerators/platform_accelerator_cocoa.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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 | Annotate | Revision Log
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 #ifndef UI_BASE_ACCELERATORS_PLATFORM_ACCELERATOR_COCOA_H_ 5 #ifndef UI_BASE_ACCELERATORS_PLATFORM_ACCELERATOR_COCOA_H_
6 #define UI_BASE_ACCELERATORS_PLATFORM_ACCELERATOR_COCOA_H_ 6 #define UI_BASE_ACCELERATORS_PLATFORM_ACCELERATOR_COCOA_H_
7 7
8 #include <Foundation/Foundation.h> 8 #include <Foundation/Foundation.h>
9 9
10 #include "base/memory/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "ui/base/accelerators/platform_accelerator.h" 11 #include "ui/base/accelerators/platform_accelerator.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 // This is a Mac specific class for specifing accelerator keys. 15 // This is a Mac specific class for specifing accelerator keys.
16 class UI_EXPORT PlatformAcceleratorCocoa : public PlatformAccelerator { 16 class UI_EXPORT PlatformAcceleratorCocoa : public PlatformAccelerator {
17 public: 17 public:
18 PlatformAcceleratorCocoa(); 18 PlatformAcceleratorCocoa();
19 PlatformAcceleratorCocoa(NSString* key_code, NSUInteger modifier_mask); 19 PlatformAcceleratorCocoa(NSString* key_code, NSUInteger modifier_mask);
20 virtual ~PlatformAcceleratorCocoa(); 20 virtual ~PlatformAcceleratorCocoa();
21 21
22 // PlatformAccelerator: 22 // PlatformAccelerator:
23 virtual scoped_ptr<PlatformAccelerator> CreateCopy() const OVERRIDE; 23 virtual scoped_ptr<PlatformAccelerator> CreateCopy() const OVERRIDE;
24 virtual bool Equals(const PlatformAccelerator& rhs) const OVERRIDE; 24 virtual bool Equals(const PlatformAccelerator& rhs) const OVERRIDE;
25 25
26 NSString* characters() const { return characters_.get(); } 26 NSString* characters() const { return characters_.get(); }
27 NSUInteger modifier_mask() const { return modifier_mask_; } 27 NSUInteger modifier_mask() const { return modifier_mask_; }
28 28
29 private: 29 private:
30 // String of characters for the key equivalent. 30 // String of characters for the key equivalent.
31 scoped_nsobject<NSString> characters_; 31 base::scoped_nsobject<NSString> characters_;
32 NSUInteger modifier_mask_; 32 NSUInteger modifier_mask_;
33 33
34 DISALLOW_COPY_AND_ASSIGN(PlatformAcceleratorCocoa); 34 DISALLOW_COPY_AND_ASSIGN(PlatformAcceleratorCocoa);
35 }; 35 };
36 36
37 } // namespace ui 37 } // namespace ui
38 38
39 #endif // UI_BASE_ACCELERATORS_PLATFORM_ACCELERATOR_COCOA_H_ 39 #endif // UI_BASE_ACCELERATORS_PLATFORM_ACCELERATOR_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698