Extends DBusThreadManager to connect ibus-bus.

chrome/browser/chromeos/input_method/ibus_controller_impl.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_IBUS_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_
 #pragma once
 
 #include <gio/gio.h>  // GAsyncResult and related types.
 #include <glib-object.h>
@@ skipping 42 matching lines @@
   virtual void SendHandwritingStroke(const HandwritingStroke& stroke) OVERRIDE;
   virtual void CancelHandwriting(int n_strokes) OVERRIDE;
 #endif
 
   // Calls <anonymous_namespace>::FindAndUpdateProperty. This method is just for
   // unit testing.
   static bool FindAndUpdatePropertyForTesting(
       const InputMethodProperty& new_prop,
       InputMethodPropertyList* prop_list);
 
+  // Called after the connection to ibus-daemon is established.
+  void IBusDaemonInitializationDone();
+
  private:
+  enum IBusDaemonStatus{
+    IBUS_DAEMON_INITIALIZING,
+    IBUS_DAEMON_RUNNING,
+    IBUS_DAEMON_SHUTTING_DOWN,
+    IBUS_DAEMON_STOP,
+  };
+
   // Functions that end with Thunk are used to deal with glib callbacks.
   CHROMEG_CALLBACK_0(IBusControllerImpl, void, BusConnected, IBusBus*);
   CHROMEG_CALLBACK_0(IBusControllerImpl, void, BusDisconnected, IBusBus*);
   CHROMEG_CALLBACK_3(IBusControllerImpl, void, BusNameOwnerChanged,
                      IBusBus*, const gchar*, const gchar*, const gchar*);
   CHROMEG_CALLBACK_1(IBusControllerImpl, void, FocusIn,
                      IBusPanelService*, const gchar*);
   CHROMEG_CALLBACK_1(IBusControllerImpl, void, RegisterProperties,
                      IBusPanelService*, IBusPropList*);
   CHROMEG_CALLBACK_1(IBusControllerImpl, void, UpdateProperty,
@@ skipping 30 matching lines @@
   void SendAllInputMethodConfigs();
 
   // Starts listening to the "connected", "disconnected", and
   // "name-owner-changed" D-Bus signals from ibus-daemon.
   void ConnectBusSignals();
 
   // Starts listening to the "focus-in", "register-properties", and
   // "update-property" D-Bus signals from ibus-daemon.
   void ConnectPanelServiceSignals();
 
-  // Starts ibus-daemon if it's not yet started and |should_launch_daemon_| is
-  // true.
-  bool MaybeLaunchIBusDaemon();
+  // Adds address file watcher in FILE thread and then calls LaunchIBusDaemon.
+  bool StartIBusDaemon();
+
+  // Starts ibus-daemon.
+  void LaunchIBusDaemon(const std::string& ibus_address);
 
   // Launches an input method procsess specified by the given command
   // line. On success, returns true and stores the process handle in
   // |process_handle|. Otherwise, returns false, and the contents of
   // |process_handle| is untouched. |watch_func| will be called when the
   // process terminates.
   bool LaunchProcess(const std::string& command_line,
                      base::ProcessHandle* process_handle,
                      GChildWatchFunc watch_func);
 
   // A callback function that will be called when ibus_config_set_value_async()
   // request is finished.
   static void SetInputMethodConfigCallback(GObject* source_object,
                                            GAsyncResult* res,
                                            gpointer user_data);
 
   // Called when the input method process is shut down.
   static void OnIBusDaemonExit(GPid pid,
                                gint status,
                                IBusControllerImpl* controller);
 
   // Connection to the ibus-daemon via IBus API. These objects are used to
   // call ibus-daemon's API (e.g. activate input methods, set config, ...)
   IBusBus* ibus_;
   IBusConfig* ibus_config_;
 
-  // true when ibus-daemon should be running.
-  bool should_launch_daemon_;
-
   // The process handle of the IBus daemon. kNullProcessHandle if it's not
   // running.
   base::ProcessHandle process_handle_;
 
   // Current input context path.
   std::string current_input_context_path_;
 
   // The input method ID which is currently selected. The ID is sent to the
   // daemon when |ibus_| and |ibus_config_| connections are both established.
   std::string current_input_method_id_;
 
   // An object which knows all valid input methods and layout IDs.
   InputMethodWhitelist whitelist_;
 
+  // Represents ibus-daemon's status.
+  IBusDaemonStatus ibus_daemon_status_;
+
+  // The retry count if the ibus-daemon is crashed in initializing step.
+  int ibus_launch_retry_count_;

[Yusuke Sato, 2012/05/01 07:06:55]

Wouldn't it be possible not to add this variable for now? For me, the variable
is making it even harder to review your CL...

If you're worried that too many file watcher instances could be created, see my
comment in StartAddressFileWatch().

[Seigo Nonaka, 2012/05/02 05:12:10]

Okay, I removed this variable.
On 2012/05/01 07:06:55, Yusuke Sato wrote:

+
+  // Used for making callbacks for PostTask.
+  base::WeakPtrFactory<IBusControllerImpl> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(IBusControllerImpl);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_