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

Side by Side Diff: chromeos/dbus/ibus/ibus_input_context_client.cc

Issue 10704118: Clean Up: Gather ibus constants to ibus_constants.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
« no previous file with comments | « chromeos/dbus/ibus/ibus_constants.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chromeos/dbus/ibus/ibus_input_context_client.h" 5 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
6 6
7 #include <string> 7 #include <string>
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "chromeos/dbus/ibus/ibus_constants.h"
11 #include "chromeos/dbus/ibus/ibus_text.h" 10 #include "chromeos/dbus/ibus/ibus_text.h"
12 #include "dbus/bus.h" 11 #include "dbus/bus.h"
13 #include "dbus/message.h" 12 #include "dbus/message.h"
14 #include "dbus/object_path.h" 13 #include "dbus/object_path.h"
15 #include "dbus/object_proxy.h" 14 #include "dbus/object_proxy.h"
16 15
17 namespace chromeos { 16 namespace chromeos {
18 17
19 // TODO(nona): Remove after complete libibus removal. 18 // TODO(nona): Remove after complete libibus removal.
20 using chromeos::ibus::IBusText; 19 using chromeos::ibus::IBusText;
21 20
22 namespace { 21 namespace {
22 const char kIBusServiceName[] = "org.freedesktop.IBus";
23 const char kIBusInputContextInterface[] = "org.freedesktop.IBus.InputContext"; 23 const char kIBusInputContextInterface[] = "org.freedesktop.IBus.InputContext";
satorux1 2012/07/10 07:21:40 you should instead move this to ibus_constants.h .
Seigo Nonaka 2012/07/10 08:06:37 Done.
24 24
25 // Signal names. 25 // Signal names.
26 const char kCommitTextSignal[] = "CommitText"; 26 const char kCommitTextSignal[] = "CommitText";
27 const char kForwardKeyEventSignal[] = "ForwardKeyEvent"; 27 const char kForwardKeyEventSignal[] = "ForwardKeyEvent";
28 const char kHidePreeditTextSignal[] = "HidePreeditText"; 28 const char kHidePreeditTextSignal[] = "HidePreeditText";
29 const char kShowPreeditTextSignal[] = "ShowPreeditText"; 29 const char kShowPreeditTextSignal[] = "ShowPreeditText";
30 const char kUpdatePreeditTextSignal[] = "UpdatePreeditText"; 30 const char kUpdatePreeditTextSignal[] = "UpdatePreeditText";
31 31
32 // Method names. 32 // Method names.
33 const char kFocusInMethod[] = "FocusIn"; 33 const char kFocusInMethod[] = "FocusIn";
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 // static 422 // static
423 IBusInputContextClient* IBusInputContextClient::Create( 423 IBusInputContextClient* IBusInputContextClient::Create(
424 DBusClientImplementationType type) { 424 DBusClientImplementationType type) {
425 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) { 425 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) {
426 return new IBusInputContextClientImpl(); 426 return new IBusInputContextClientImpl();
427 } 427 }
428 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); 428 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
429 return new IBusInputContextClientStubImpl(); 429 return new IBusInputContextClientStubImpl();
430 } 430 }
431 } // namespace chromeos 431 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/ibus/ibus_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698