Delete IBusEngineFactoryService.

chrome/browser/chromeos/input_method/input_method_engine_ibus.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_IBUS_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_IBUS_H_
 
 #include <map>
 #include <string>
 #include <vector>
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
 #include "chromeos/ime/ibus_bridge.h"
 #include "dbus/object_path.h"
 
 namespace chromeos {
 
 class IBusText;
 
-class IBusEngineFactoryService;
 class IBusEngineService;
 
 namespace input_method {
 class CandidateWindow;
 struct KeyEventHandle;
 }  // namespace input_method
 
 class InputMethodEngineIBus : public InputMethodEngine,
                               public IBusEngineHandlerInterface {
  public:
@@ skipping 58 matching lines @@
   virtual void SetCapability(IBusCapability capability) OVERRIDE;
   virtual void Reset() OVERRIDE;
   virtual void ProcessKeyEvent(uint32 keysym, uint32 keycode, uint32 state,
                                const KeyEventDoneCallback& callback) OVERRIDE;
   virtual void CandidateClicked(uint32 index, ibus::IBusMouseButton button,
                                 uint32 state) OVERRIDE;
   virtual void SetSurroundingText(const std::string& text, uint32 cursor_pos,
                                   uint32 anchor_pos) OVERRIDE;
 
   // Called when the connection with ibus-daemon is connected.
   void OnConnected();

[Seigo Nonaka, 2013/11/12 03:37:22]

This function does no longer make sense.
Please remove :)

[Hiro Komatsu, 2013/11/12 05:01:39]

Thank you for the information.  Please let me do it  in a different patch, since
it seems to be called by  InputMethodManager so deleting it would not be the
focus of this patch.

 
   // Called whtn the connection with ibus-daemon is disconnected.
   void OnDisconnected();

[Seigo Nonaka, 2013/11/12 03:37:22]

ditto

[Hiro Komatsu, 2013/11/12 05:01:39]

Here too.

 
  private:
   // Converts MenuItem to InputMethodProperty.
   void MenuItemToProperty(const MenuItem& item,
                           input_method::InputMethodProperty* property);
 
   // Registers the engine component.
   void RegisterComponent();
 
-  // Called when the ibus-daemon sends CreateEngine message with corresponding
-  // engine id.
-  void CreateEngineHandler(
-      const IBusEngineFactoryService::CreateEngineResponseSender& sender);
+  // Called when the IBusBrige executes CreateEngine with
+  // corresponding engine id.
+  void CreateEngineHandler();
 
   // Returns current IBusEngineService, if there is no available service, this
   // function returns NULL.
   IBusEngineService* GetCurrentService();
 
   // True if the current context has focus.
   bool focused_;
 
   // True if this engine is active.
   bool active_;
 
   // ID that is used for the current input context.  False if there is no focus.
   int context_id_;
 
   // Next id that will be assigned to a context.
   int next_context_id_;
 
   // This IME ID in Chrome Extension.
   std::string engine_id_;
 
   // This IME ID in ibus.
   std::string ibus_id_;
 
-  // The current object path.
-  dbus::ObjectPath object_path_;
+  // Flag whether CreateEngineHandler is called or not.
+  bool is_create_engine_handler_called_;

[Seigo Nonaka, 2013/11/12 03:37:22]

I'm curious about this flag.

Why do we check the CreateEngineHandler is called or not?
CreateEngineHandler does no longer make sense because each Engine instances
keeps alive during user session. We just switch the activated instance with the
SetGlobalEngine call.
Can we just check |active_| instead of this flag?

[Hiro Komatsu, 2013/11/12 05:01:39]

I just focused on the deletion of IBusEngineFactoryService keeping the current
logic as-is.  object_path_ was checked if it was empty or not, so I tried to
keep this logic using a bool variable instead of object_path_.

So please let me change the logic you suggested, after deleting
IBusEngineFactoryService.

 
   // The current auxialy text and it's visiblity.
   scoped_ptr<IBusText> aux_text_;
   bool aux_text_visible_;
 
   // Pointer to the object recieving events for this IME.
   InputMethodEngine::Observer* observer_;
 
   // The current preedit text, and it's cursor position.
   scoped_ptr<IBusText> preedit_text_;
   int preedit_cursor_;
 
   // The current candidate window.
   scoped_ptr<input_method::CandidateWindow> candidate_window_;
 
   // The current candidate window property.
   CandidateWindowProperty candidate_window_property_;
 
   // Indicates whether the candidate window is visible.
   bool window_visible_;
 
   // Mapping of candidate index to candidate id.
   std::vector<int> candidate_ids_;
 
   // Mapping of candidate id to index.
   std::map<int, int> candidate_indexes_;
 
   scoped_ptr<IBusEngineService> ibus_engine_service_;
-  scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_;
 
   // Used for making callbacks.
   base::WeakPtrFactory<InputMethodEngineIBus> weak_ptr_factory_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_IBUS_H_