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

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

Issue 12672008: Move xkeyboard.cc from c/b/chromeos/input_method to chromeos/ime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 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 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h" 5 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
6 6
7 #include <algorithm> // std::find 7 #include <algorithm> // std::find
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
13 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" 13 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
14 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h" 14 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
15 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
16 #include "chrome/browser/chromeos/language_preferences.h" 15 #include "chrome/browser/chromeos/language_preferences.h"
17 #include "chromeos/dbus/dbus_thread_manager.h" 16 #include "chromeos/dbus/dbus_thread_manager.h"
18 #include "chromeos/dbus/ibus/ibus_input_context_client.h" 17 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
19 #include "chromeos/ime/extension_ime_util.h" 18 #include "chromeos/ime/extension_ime_util.h"
20 #include "chromeos/ime/input_method_delegate.h" 19 #include "chromeos/ime/input_method_delegate.h"
20 #include "chromeos/ime/xkeyboard.h"
21 #include "third_party/icu/public/common/unicode/uloc.h" 21 #include "third_party/icu/public/common/unicode/uloc.h"
22 #include "ui/base/accelerators/accelerator.h" 22 #include "ui/base/accelerators/accelerator.h"
23 23
24 namespace chromeos { 24 namespace chromeos {
25 namespace input_method { 25 namespace input_method {
26 26
27 namespace { 27 namespace {
28 28
29 bool Contains(const std::vector<std::string>& container, 29 bool Contains(const std::vector<std::string>& container,
30 const std::string& value) { 30 const std::string& value) {
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 candidate_window_controller_.reset( 695 candidate_window_controller_.reset(
696 CandidateWindowController::CreateCandidateWindowController()); 696 CandidateWindowController::CreateCandidateWindowController());
697 if (candidate_window_controller_->Init(ibus_controller_.get())) 697 if (candidate_window_controller_->Init(ibus_controller_.get()))
698 candidate_window_controller_->AddObserver(this); 698 candidate_window_controller_->AddObserver(this);
699 else 699 else
700 DVLOG(1) << "Failed to initialize the candidate window controller"; 700 DVLOG(1) << "Failed to initialize the candidate window controller";
701 } 701 }
702 702
703 } // namespace input_method 703 } // namespace input_method
704 } // namespace chromeos 704 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698