diff options
Diffstat (limited to 'ui')
-rw-r--r-- | ui/base/models/accelerator_cocoa.h | 29 | ||||
-rw-r--r-- | ui/base/models/accelerator_cocoa.mm | 37 | ||||
-rw-r--r-- | ui/gfx/transform_skia.cc | 2 | ||||
-rw-r--r-- | ui/gfx/transform_skia.h | 2 |
4 files changed, 46 insertions, 24 deletions
diff --git a/ui/base/models/accelerator_cocoa.h b/ui/base/models/accelerator_cocoa.h index 7c3db16..994cb18 100644 --- a/ui/base/models/accelerator_cocoa.h +++ b/ui/base/models/accelerator_cocoa.h @@ -19,31 +19,14 @@ namespace ui { // |-copy| to the |key_code| paramater in the constructor. class AcceleratorCocoa : public Accelerator { public: - AcceleratorCocoa(NSString* key_code, NSUInteger mask) - : Accelerator(ui::VKEY_UNKNOWN, mask), - characters_([key_code copy]) { - } - - AcceleratorCocoa(const AcceleratorCocoa& accelerator) - : Accelerator(accelerator) { - characters_.reset([accelerator.characters_ copy]); - } + AcceleratorCocoa(); + AcceleratorCocoa(NSString* key_code, NSUInteger mask); + AcceleratorCocoa(const AcceleratorCocoa& accelerator); + virtual ~AcceleratorCocoa(); - AcceleratorCocoa() : Accelerator() {} - virtual ~AcceleratorCocoa() {} + AcceleratorCocoa& operator=(const AcceleratorCocoa& accelerator); - AcceleratorCocoa& operator=(const AcceleratorCocoa& accelerator) { - if (this != &accelerator) { - *static_cast<Accelerator*>(this) = accelerator; - characters_.reset([accelerator.characters_ copy]); - } - return *this; - } - - bool operator==(const AcceleratorCocoa& rhs) const { - return [characters_ isEqualToString:rhs.characters_.get()] && - (modifiers_ == rhs.modifiers_); - } + bool operator==(const AcceleratorCocoa& rhs) const; NSString* characters() const { return characters_.get(); diff --git a/ui/base/models/accelerator_cocoa.mm b/ui/base/models/accelerator_cocoa.mm new file mode 100644 index 0000000..946adb8 --- /dev/null +++ b/ui/base/models/accelerator_cocoa.mm @@ -0,0 +1,37 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ui/base/models/accelerator_cocoa.h" + +namespace ui { + +AcceleratorCocoa::AcceleratorCocoa() : Accelerator() {} + +AcceleratorCocoa::AcceleratorCocoa(NSString* key_code, NSUInteger mask) + : Accelerator(ui::VKEY_UNKNOWN, mask), + characters_([key_code copy]) { +} + +AcceleratorCocoa::AcceleratorCocoa(const AcceleratorCocoa& accelerator) + : Accelerator(accelerator) { + characters_.reset([accelerator.characters_ copy]); +} + +AcceleratorCocoa::~AcceleratorCocoa() {} + +AcceleratorCocoa& AcceleratorCocoa::operator=( + const AcceleratorCocoa& accelerator) { + if (this != &accelerator) { + *static_cast<Accelerator*>(this) = accelerator; + characters_.reset([accelerator.characters_ copy]); + } + return *this; +} + +bool AcceleratorCocoa::operator==(const AcceleratorCocoa& rhs) const { + return [characters_ isEqualToString:rhs.characters_.get()] && + (modifiers_ == rhs.modifiers_); +} + +} // namespace ui diff --git a/ui/gfx/transform_skia.cc b/ui/gfx/transform_skia.cc index 50a7dcd..5d33ec8 100644 --- a/ui/gfx/transform_skia.cc +++ b/ui/gfx/transform_skia.cc @@ -22,6 +22,8 @@ TransformSkia::TransformSkia() { matrix_->reset(); } +TransformSkia::~TransformSkia() {} + void TransformSkia::SetRotate(float degree) { matrix_->setRotate(SkFloatToScalar(degree)); } diff --git a/ui/gfx/transform_skia.h b/ui/gfx/transform_skia.h index 1bd8188..83f58c5 100644 --- a/ui/gfx/transform_skia.h +++ b/ui/gfx/transform_skia.h @@ -23,7 +23,7 @@ namespace ui { class TransformSkia : public Transform { public: TransformSkia(); - virtual ~TransformSkia() {} + virtual ~TransformSkia(); // Overridden from ui::Transform virtual void SetRotate(float degree) OVERRIDE; |