8 files changed, 30 insertions, 31 deletions

diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
index e4a3fc6..16f8653 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
@@ -82,7 +82,7 @@ InputMethodEngineIBus::~InputMethodEngineIBus() {
 }
 
 void InputMethodEngineIBus::Initialize(
-    InputMethodEngine::Observer* observer,
+    InputMethodEngineInterface::Observer* observer,
     const char* engine_name,
     const char* extension_id,
     const char* engine_id,
@@ -211,7 +211,7 @@ InputMethodEngineIBus::GetCandidateWindowProperty() const {
 
 void InputMethodEngineIBus::SetCandidateWindowProperty(
     const CandidateWindowProperty& property) {
-  // Type conversion from InputMethodEngine::CandidateWindowProperty to
+  // Type conversion from InputMethodEngineInterface::CandidateWindowProperty to
   // CandidateWindow::CandidateWindowProperty defined in chromeos/ime/.
   input_method::CandidateWindow::CandidateWindowProperty dest_property;
   dest_property.page_size = property.page_size;
@@ -401,7 +401,7 @@ void InputMethodEngineIBus::FocusIn(
   context_id_ = next_context_id_;
   ++next_context_id_;
 
-  InputMethodEngine ::InputContext context;
+  InputMethodEngineInterface::InputContext context;
   context.id = context_id_;
   switch (input_context.type) {
     case ui::TEXT_INPUT_TYPE_SEARCH:
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus.h b/chrome/browser/chromeos/input_method/input_method_engine_ibus.h
index d79476e..06c249b 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.h
+++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.h
@@ -8,7 +8,7 @@
 #include <map>
 #include <string>
 #include <vector>
-#include "chrome/browser/chromeos/input_method/input_method_engine.h"
+#include "chrome/browser/chromeos/input_method/input_method_engine_interface.h"
 #include "ui/base/ime/chromeos/ibus_bridge.h"
 #include "url/gurl.h"
 
@@ -26,7 +26,7 @@ struct InputMethodProperty;
 struct KeyEventHandle;
 }  // namespace input_method
 
-class InputMethodEngineIBus : public InputMethodEngine,
+class InputMethodEngineIBus : public InputMethodEngineInterface,
                               public IBusEngineHandlerInterface {
  public:
   InputMethodEngineIBus();
@@ -34,7 +34,7 @@ class InputMethodEngineIBus : public InputMethodEngine,
   virtual ~InputMethodEngineIBus();
 
   void Initialize(
-      InputMethodEngine::Observer* observer,
+      InputMethodEngineInterface::Observer* observer,
       const char* engine_name,
       const char* extension_id,
       const char* engine_id,
@@ -43,7 +43,7 @@ class InputMethodEngineIBus : public InputMethodEngine,
       const GURL& options_page,
       const GURL& input_view);
 
-  // InputMethodEngine overrides.
+  // InputMethodEngineInterface overrides.
   virtual void StartIme() OVERRIDE;
   virtual bool SetComposition(int context_id,
                               const char* text,
@@ -120,7 +120,7 @@ class InputMethodEngineIBus : public InputMethodEngine,
   bool aux_text_visible_;
 
   // Pointer to the object recieving events for this IME.
-  InputMethodEngine::Observer* observer_;
+  InputMethodEngineInterface::Observer* observer_;
 
   // The current preedit text, and it's cursor position.
   scoped_ptr<IBusText> preedit_text_;
diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine_interface.cc
index fe3e6b2..da1d8fb 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_interface.cc
@@ -1,32 +1,30 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "chrome/browser/chromeos/input_method/input_method_engine.h"
-
-#include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
+#include "chrome/browser/chromeos/input_method/input_method_engine_interface.h"
 
 namespace chromeos {
 
-InputMethodEngine::KeyboardEvent::KeyboardEvent()
+InputMethodEngineInterface::KeyboardEvent::KeyboardEvent()
     : alt_key(false),
       ctrl_key(false),
       shift_key(false) {
 }
 
-InputMethodEngine::KeyboardEvent::~KeyboardEvent() {
+InputMethodEngineInterface::KeyboardEvent::~KeyboardEvent() {
 }
 
-InputMethodEngine::MenuItem::MenuItem() {
+InputMethodEngineInterface::MenuItem::MenuItem() {
 }
 
-InputMethodEngine::MenuItem::~MenuItem() {
+InputMethodEngineInterface::MenuItem::~MenuItem() {
 }
 
-InputMethodEngine::Candidate::Candidate() {
+InputMethodEngineInterface::Candidate::Candidate() {
 }
 
-InputMethodEngine::Candidate::~Candidate() {
+InputMethodEngineInterface::Candidate::~Candidate() {
 }
 
 namespace {
@@ -36,16 +34,17 @@ const int kDefaultPageSize = 9;
 
 // When the default values are changed, please modify
 // CandidateWindow::CandidateWindowProperty defined in chromeos/ime/ too.
-InputMethodEngine::CandidateWindowProperty::CandidateWindowProperty()
+InputMethodEngineInterface::CandidateWindowProperty::CandidateWindowProperty()
     : page_size(kDefaultPageSize),
       is_cursor_visible(true),
       is_vertical(false),
       show_window_at_composition(false) {
 }
 
-InputMethodEngine::CandidateWindowProperty::~CandidateWindowProperty() {
+InputMethodEngineInterface::CandidateWindowProperty::~CandidateWindowProperty()
+{
 }
 
-InputMethodEngine::Observer::~Observer() {
+InputMethodEngineInterface::Observer::~Observer() {
 }
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/input_method/input_method_engine.h b/chrome/browser/chromeos/input_method/input_method_engine_interface.h
index be628df..7d2dea8 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine.h
+++ b/chrome/browser/chromeos/input_method/input_method_engine_interface.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
-#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_INTERFACE_H_
+#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_INTERFACE_H_
 
 #include <string>
 #include <vector>
@@ -18,7 +18,7 @@ struct KeyEventHandle;
 
 // InputMethodEngine is used to translate from the Chrome IME API to the native
 // API.
-class InputMethodEngine {
+class InputMethodEngineInterface {
  public:
   struct KeyboardEvent {
     KeyboardEvent();
@@ -160,7 +160,7 @@ class InputMethodEngine {
     virtual void OnReset(const std::string& engine_id) = 0;
   };
 
-  virtual ~InputMethodEngine() {}
+  virtual ~InputMethodEngineInterface() {}
 
   // Called when the input metho initialization is done.
   // This function is called from private API.
@@ -242,4 +242,4 @@ class InputMethodEngine {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_INTERFACE_H_
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
index a532e7d..45c8a44 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -418,7 +418,7 @@ void InputMethodManagerImpl::AddInputMethodExtension(
     const std::vector<std::string>& languages,
     const GURL& options_url,
     const GURL& inputview_url,
-    InputMethodEngine* engine) {
+    InputMethodEngineInterface* engine) {
   if (state_ == STATE_TERMINATING)
     return;
 
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
index cdf5925..56f294e 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
@@ -72,7 +72,7 @@ class InputMethodManagerImpl : public InputMethodManager,
       const std::vector<std::string>& languages,
       const GURL& options_page,
       const GURL& input_view,
-      InputMethodEngine* instance) OVERRIDE;
+      InputMethodEngineInterface* instance) OVERRIDE;
   virtual void RemoveInputMethodExtension(const std::string& id) OVERRIDE;
   virtual void GetInputMethodExtensions(
       InputMethodDescriptors* result) OVERRIDE;
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
index 65c3df2..016db70 100644
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
@@ -89,7 +89,7 @@ void MockInputMethodManager::AddInputMethodExtension(
     const std::vector<std::string>& languages,
     const GURL& options_url,
     const GURL& inputview_url,
-    InputMethodEngine* instance) {
+    InputMethodEngineInterface* instance) {
 }
 
 void MockInputMethodManager::RemoveInputMethodExtension(const std::string& id) {
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.h b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
index 4a8ac4d..d9bff19 100644
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
@@ -49,7 +49,7 @@ class MockInputMethodManager : public InputMethodManager {
       const std::vector<std::string>& languages,
       const GURL& options_url,
       const GURL& inputview_url,
-      InputMethodEngine* instance) OVERRIDE;
+      InputMethodEngineInterface* instance) OVERRIDE;
   virtual void RemoveInputMethodExtension(const std::string& id) OVERRIDE;
   virtual void GetInputMethodExtensions(
       InputMethodDescriptors* result) OVERRIDE;