summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authornona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-21 06:32:13 +0000
committernona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-21 06:32:13 +0000
commit5bd3615fbd27bdd6a87d0c6055b8009553e23581 (patch)
tree92769afd3a7e3822e6c97c9db975f3ce3b03eb5e /chromeos
parentebc60b7e762cba599c16228c79ae3420f7b191c9 (diff)
downloadchromium_src-5bd3615fbd27bdd6a87d0c6055b8009553e23581.zip
chromium_src-5bd3615fbd27bdd6a87d0c6055b8009553e23581.tar.gz
chromium_src-5bd3615fbd27bdd6a87d0c6055b8009553e23581.tar.bz2
Remove operator function.
To making InputMethodDescriptor simple, let me remove operators. Also remove operator related tests because operator had been used only in tests. BUG=None TEST=ran all unit_tests. Review URL: https://codereview.chromium.org/14123005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/chromeos.gyp1
-rw-r--r--chromeos/ime/input_method_descriptor.cc10
-rw-r--r--chromeos/ime/input_method_descriptor.h3
-rw-r--r--chromeos/ime/input_method_descriptor_unittest.cc40
4 files changed, 0 insertions, 54 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 8dc61ad..13496ef 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -452,7 +452,6 @@
'disks/disk_mount_manager_unittest.cc',
'ime/component_extension_ime_manager_unittest.cc',
'ime/extension_ime_util_unittest.cc',
- 'ime/input_method_descriptor_unittest.cc',
'ime/input_method_property_unittest.cc',
'ime/input_method_whitelist_unittest.cc',
'ime/xkeyboard_unittest.cc',
diff --git a/chromeos/ime/input_method_descriptor.cc b/chromeos/ime/input_method_descriptor.cc
index ef856af..3215b68 100644
--- a/chromeos/ime/input_method_descriptor.cc
+++ b/chromeos/ime/input_method_descriptor.cc
@@ -31,15 +31,5 @@ InputMethodDescriptor::InputMethodDescriptor() {
InputMethodDescriptor::~InputMethodDescriptor() {
}
-bool InputMethodDescriptor::operator==(
- const InputMethodDescriptor& other) const {
- return id() == other.id();
-}
-
-bool InputMethodDescriptor::operator!=(
- const InputMethodDescriptor& other) const {
- return !(*this == other);
-}
-
} // namespace input_method
} // namespace chromeos
diff --git a/chromeos/ime/input_method_descriptor.h b/chromeos/ime/input_method_descriptor.h
index e884517..29f4f02 100644
--- a/chromeos/ime/input_method_descriptor.h
+++ b/chromeos/ime/input_method_descriptor.h
@@ -27,9 +27,6 @@ class CHROMEOS_EXPORT InputMethodDescriptor {
const std::string& options_page_url);
~InputMethodDescriptor();
- bool operator==(const InputMethodDescriptor& other) const;
- bool operator!=(const InputMethodDescriptor& other) const;
-
const std::string& id() const { return id_; }
const std::string& name() const { return name_; }
const std::string& keyboard_layout() const { return keyboard_layout_; }
diff --git a/chromeos/ime/input_method_descriptor_unittest.cc b/chromeos/ime/input_method_descriptor_unittest.cc
deleted file mode 100644
index 54bf753..0000000
--- a/chromeos/ime/input_method_descriptor_unittest.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2012 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 "base/logging.h"
-#include "chromeos/ime/input_method_descriptor.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace chromeos {
-namespace input_method {
-
-namespace {
-
-const char kFallbackLayout[] = "us";
-
-class InputMethodDescriptorTest : public testing::Test {
- public:
- InputMethodDescriptorTest() {
- }
-
- protected:
- InputMethodDescriptor GetDescById(const std::string& id) {
- return InputMethodDescriptor(id,
- "", // name
- "us",
- "language_code",
- "");
- }
-};
-
-} // namespace
-
-TEST_F(InputMethodDescriptorTest, TestOperatorEqual) {
- EXPECT_EQ(GetDescById("xkb:us::eng"), GetDescById("xkb:us::eng"));
- EXPECT_NE(GetDescById("xkb:us::eng"), GetDescById("xkb:us:dvorak:eng"));
- EXPECT_NE(GetDescById("xkb:fr::fra"), GetDescById("xkb:us::eng"));
-}
-
-} // namespace input_method
-} // namespace chromeos