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

Side by Side Diff: trunk/src/chrome/browser/chromeos/input_method/input_method_manager_impl.h

Issue 12453021: Revert 190596 "Extract input_method_whitelist.{h|cc} from c/b/ch..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 9 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_INPUT_METHOD_MANAGER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" 14 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
15 #include "chrome/browser/chromeos/input_method/ibus_controller.h" 15 #include "chrome/browser/chromeos/input_method/ibus_controller.h"
16 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 16 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
17 #include "chrome/browser/chromeos/input_method/input_method_util.h" 17 #include "chrome/browser/chromeos/input_method/input_method_util.h"
18 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
18 #include "chromeos/ime/ibus_daemon_controller.h" 19 #include "chromeos/ime/ibus_daemon_controller.h"
19 #include "chromeos/ime/input_method_whitelist.h"
20 20
21 namespace chromeos { 21 namespace chromeos {
22 class InputMethodEngineIBus; 22 class InputMethodEngineIBus;
23 namespace input_method { 23 namespace input_method {
24 class InputMethodDelegate; 24 class InputMethodDelegate;
25 class XKeyboard; 25 class XKeyboard;
26 26
27 // The implementation of InputMethodManager. 27 // The implementation of InputMethodManager.
28 class InputMethodManagerImpl : public InputMethodManager, 28 class InputMethodManagerImpl : public InputMethodManager,
29 public CandidateWindowController::Observer, 29 public CandidateWindowController::Observer,
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 // auto-repeat interval. 186 // auto-repeat interval.
187 scoped_ptr<XKeyboard> xkeyboard_; 187 scoped_ptr<XKeyboard> xkeyboard_;
188 188
189 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl); 189 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
190 }; 190 };
191 191
192 } // namespace input_method 192 } // namespace input_method
193 } // namespace chromeos 193 } // namespace chromeos
194 194
195 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ 195 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698