Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: chrome/browser/chromeos/input_method/ibus_controller_impl.h

Issue 11783053: Clean Up: Remove ibus namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_
7 7
8 #include <gio/gio.h> // GAsyncResult and related types. 8 #include <gio/gio.h> // GAsyncResult and related types.
9 9
10 #include <string> 10 #include <string>
(...skipping 11 matching lines...) Expand all
22 22
23 namespace chromeos { 23 namespace chromeos {
24 namespace input_method { 24 namespace input_method {
25 25
26 struct InputMethodConfigValue; 26 struct InputMethodConfigValue;
27 struct InputMethodProperty; 27 struct InputMethodProperty;
28 typedef std::vector<InputMethodProperty> InputMethodPropertyList; 28 typedef std::vector<InputMethodProperty> InputMethodPropertyList;
29 29
30 // The IBusController implementation. 30 // The IBusController implementation.
31 class IBusControllerImpl : public IBusControllerBase, 31 class IBusControllerImpl : public IBusControllerBase,
32 public ibus::IBusPanelPropertyHandlerInterface { 32 public IBusPanelPropertyHandlerInterface {
33 public: 33 public:
34 IBusControllerImpl(); 34 IBusControllerImpl();
35 virtual ~IBusControllerImpl(); 35 virtual ~IBusControllerImpl();
36 36
37 // IBusController overrides: 37 // IBusController overrides:
38 virtual bool Start() OVERRIDE; 38 virtual bool Start() OVERRIDE;
39 virtual void Reset() OVERRIDE; 39 virtual void Reset() OVERRIDE;
40 virtual bool Stop() OVERRIDE; 40 virtual bool Stop() OVERRIDE;
41 virtual bool ChangeInputMethod(const std::string& id) OVERRIDE; 41 virtual bool ChangeInputMethod(const std::string& id) OVERRIDE;
42 virtual bool ActivateInputMethodProperty(const std::string& key) OVERRIDE; 42 virtual bool ActivateInputMethodProperty(const std::string& key) OVERRIDE;
(...skipping 12 matching lines...) Expand all
55 IBUS_DAEMON_RUNNING, 55 IBUS_DAEMON_RUNNING,
56 IBUS_DAEMON_SHUTTING_DOWN, 56 IBUS_DAEMON_SHUTTING_DOWN,
57 IBUS_DAEMON_STOP, 57 IBUS_DAEMON_STOP,
58 }; 58 };
59 59
60 // IBusControllerBase overrides: 60 // IBusControllerBase overrides:
61 virtual bool SetInputMethodConfigInternal( 61 virtual bool SetInputMethodConfigInternal(
62 const ConfigKeyType& key, 62 const ConfigKeyType& key,
63 const InputMethodConfigValue& value) OVERRIDE; 63 const InputMethodConfigValue& value) OVERRIDE;
64 64
65 // ibus::IBusPanelPropertyHandlerInterface overrides: 65 // IBusPanelPropertyHandlerInterface overrides:
66 virtual void RegisterProperties( 66 virtual void RegisterProperties(
67 const ibus::IBusPropertyList& properties) OVERRIDE; 67 const IBusPropertyList& properties) OVERRIDE;
68 virtual void UpdateProperty(const ibus::IBusProperty& property) OVERRIDE; 68 virtual void UpdateProperty(const IBusProperty& property) OVERRIDE;
69 69
70 // Checks if |ibus_| and |ibus_config_| connections are alive. 70 // Checks if |ibus_| and |ibus_config_| connections are alive.
71 bool IBusConnectionsAreAlive(); 71 bool IBusConnectionsAreAlive();
72 72
73 // Just calls ibus_bus_set_global_engine_async() with the |id|. 73 // Just calls ibus_bus_set_global_engine_async() with the |id|.
74 void SendChangeInputMethodRequest(const std::string& id); 74 void SendChangeInputMethodRequest(const std::string& id);
75 75
76 // Adds address file watcher in FILE thread and then calls LaunchIBusDaemon. 76 // Adds address file watcher in FILE thread and then calls LaunchIBusDaemon.
77 bool StartIBusDaemon(); 77 bool StartIBusDaemon();
78 78
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 // Used for making callbacks for PostTask. 133 // Used for making callbacks for PostTask.
134 base::WeakPtrFactory<IBusControllerImpl> weak_ptr_factory_; 134 base::WeakPtrFactory<IBusControllerImpl> weak_ptr_factory_;
135 135
136 DISALLOW_COPY_AND_ASSIGN(IBusControllerImpl); 136 DISALLOW_COPY_AND_ASSIGN(IBusControllerImpl);
137 }; 137 };
138 138
139 } // namespace input_method 139 } // namespace input_method
140 } // namespace chromeos 140 } // namespace chromeos
141 141
142 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_ 142 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698