| Index: ui/base/accelerators/accelerator.cc
|
| diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
|
| index de3cbf2e64a92d4fdbf1c2cc4f89f9ebd45d502e..9d6ffa72612c262ff3236024f527efbbd16dd416 100644
|
| --- a/ui/base/accelerators/accelerator.cc
|
| +++ b/ui/base/accelerators/accelerator.cc
|
| @@ -68,14 +68,15 @@ bool Accelerator::operator <(const Accelerator& rhs) const {
|
| }
|
|
|
| bool Accelerator::operator ==(const Accelerator& rhs) const {
|
| - if (platform_accelerator_.get() != rhs.platform_accelerator_.get() &&
|
| - ((!platform_accelerator_.get() || !rhs.platform_accelerator_.get()) ||
|
| - !platform_accelerator_->Equals(*rhs.platform_accelerator_))) {
|
| - return false;
|
| - }
|
| + if ((key_code_ == rhs.key_code_) && (type_ == rhs.type_) &&
|
| + (modifiers_ == rhs.modifiers_))
|
| + return true;
|
| +
|
| + bool platform_equal =
|
| + platform_accelerator_.get() && rhs.platform_accelerator_.get() &&
|
| + platform_accelerator_.get() == rhs.platform_accelerator_.get();
|
|
|
| - return (key_code_ == rhs.key_code_) && (type_ == rhs.type_) &&
|
| - (modifiers_ == rhs.modifiers_);
|
| + return platform_equal;
|
| }
|
|
|
| bool Accelerator::operator !=(const Accelerator& rhs) const {
|
|
|