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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_engine_ibus.cc

Issue 61003004: Delete ibus_object and move ibus_text to chromeos/ime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modified based on the review. Created 7 years, 1 month 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 | « no previous file | chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc » ('j') | 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 "chrome/browser/chromeos/input_method/input_method_engine_ibus.h" 5 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
6 6
7 #define XK_MISCELLANY 7 #define XK_MISCELLANY
8 #include <X11/keysymdef.h> 8 #include <X11/keysymdef.h>
9 #include <map> 9 #include <map>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "chromeos/dbus/dbus_thread_manager.h" 17 #include "chromeos/dbus/dbus_thread_manager.h"
18 #include "chromeos/dbus/ibus/ibus_text.h"
19 #include "chromeos/ime/candidate_window.h" 18 #include "chromeos/ime/candidate_window.h"
20 #include "chromeos/ime/component_extension_ime_manager.h" 19 #include "chromeos/ime/component_extension_ime_manager.h"
21 #include "chromeos/ime/extension_ime_util.h" 20 #include "chromeos/ime/extension_ime_util.h"
22 #include "chromeos/ime/ibus_keymap.h" 21 #include "chromeos/ime/ibus_keymap.h"
22 #include "chromeos/ime/ibus_text.h"
23 #include "chromeos/ime/input_method_manager.h" 23 #include "chromeos/ime/input_method_manager.h"
24 #include "dbus/object_path.h" 24 #include "dbus/object_path.h"
25 25
26 namespace chromeos { 26 namespace chromeos {
27 const char* kErrorNotActive = "IME is not active"; 27 const char* kErrorNotActive = "IME is not active";
28 const char* kErrorWrongContext = "Context is not active"; 28 const char* kErrorWrongContext = "Context is not active";
29 const char* kCandidateNotFound = "Candidate not found"; 29 const char* kCandidateNotFound = "Candidate not found";
30 const char* kEngineBusPrefix = "org.freedesktop.IBus."; 30 const char* kEngineBusPrefix = "org.freedesktop.IBus.";
31 31
32 namespace { 32 namespace {
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 ibus_id_, 581 ibus_id_,
582 base::Bind(&InputMethodEngineIBus::CreateEngineHandler, 582 base::Bind(&InputMethodEngineIBus::CreateEngineHandler,
583 weak_ptr_factory_.GetWeakPtr())); 583 weak_ptr_factory_.GetWeakPtr()));
584 } 584 }
585 585
586 void InputMethodEngineIBus::CreateEngineHandler() { 586 void InputMethodEngineIBus::CreateEngineHandler() {
587 IBusBridge::Get()->SetEngineHandler(this); 587 IBusBridge::Get()->SetEngineHandler(this);
588 } 588 }
589 589
590 } // namespace chromeos 590 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698