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

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

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit. Created 6 years 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
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 <sstream> 9 #include <sstream>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "base/sys_info.h" 21 #include "base/sys_info.h"
22 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
23 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" 23 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
24 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_i mpl.h" 24 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_i mpl.h"
25 #include "chrome/browser/chromeos/input_method/input_method_engine.h" 25 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
26 #include "chrome/browser/chromeos/language_preferences.h" 26 #include "chrome/browser/chromeos/language_preferences.h"
27 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 27 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
28 #include "chrome/browser/chromeos/profiles/profile_helper.h" 28 #include "chrome/browser/chromeos/profiles/profile_helper.h"
29 #include "chrome/browser/profiles/profile_manager.h" 29 #include "chrome/browser/profiles/profile_manager.h"
30 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
31 #include "chromeos/ime/component_extension_ime_manager.h"
32 #include "chromeos/ime/extension_ime_util.h"
33 #include "chromeos/ime/fake_ime_keyboard.h"
34 #include "chromeos/ime/ime_keyboard.h"
35 #include "chromeos/ime/input_method_delegate.h"
36 #include "components/user_manager/user_manager.h" 31 #include "components/user_manager/user_manager.h"
37 #include "third_party/icu/source/common/unicode/uloc.h" 32 #include "third_party/icu/source/common/unicode/uloc.h"
38 #include "ui/base/accelerators/accelerator.h" 33 #include "ui/base/accelerators/accelerator.h"
34 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
35 #include "ui/base/ime/chromeos/extension_ime_util.h"
36 #include "ui/base/ime/chromeos/fake_ime_keyboard.h"
37 #include "ui/base/ime/chromeos/ime_keyboard.h"
38 #include "ui/base/ime/chromeos/input_method_delegate.h"
39 #include "ui/chromeos/ime/input_method_menu_item.h" 39 #include "ui/chromeos/ime/input_method_menu_item.h"
40 #include "ui/chromeos/ime/input_method_menu_manager.h" 40 #include "ui/chromeos/ime/input_method_menu_manager.h"
41 #include "ui/keyboard/keyboard_controller.h" 41 #include "ui/keyboard/keyboard_controller.h"
42 #include "ui/keyboard/keyboard_util.h" 42 #include "ui/keyboard/keyboard_util.h"
43 43
44 namespace chromeos { 44 namespace chromeos {
45 namespace input_method { 45 namespace input_method {
46 46
47 namespace { 47 namespace {
48 48
(...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1155 if (candidate_window_controller_.get()) 1155 if (candidate_window_controller_.get())
1156 return; 1156 return;
1157 1157
1158 candidate_window_controller_.reset( 1158 candidate_window_controller_.reset(
1159 CandidateWindowController::CreateCandidateWindowController()); 1159 CandidateWindowController::CreateCandidateWindowController());
1160 candidate_window_controller_->AddObserver(this); 1160 candidate_window_controller_->AddObserver(this);
1161 } 1161 }
1162 1162
1163 } // namespace input_method 1163 } // namespace input_method
1164 } // namespace chromeos 1164 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698