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

Side by Side Diff: trunk/src/chrome/browser/chromeos/input_method/ibus_controller_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_IBUS_CONTROLLER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/process_util.h" 11 #include "base/process_util.h"
12 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.h"
13 #include "chrome/browser/chromeos/input_method/ibus_controller_base.h" 13 #include "chrome/browser/chromeos/input_method/ibus_controller_base.h"
14 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
14 #include "chromeos/dbus/ibus/ibus_panel_service.h" 15 #include "chromeos/dbus/ibus/ibus_panel_service.h"
15 #include "chromeos/ime/ibus_daemon_controller.h" 16 #include "chromeos/ime/ibus_daemon_controller.h"
16 #include "chromeos/ime/input_method_whitelist.h"
17 17
18 namespace ui { 18 namespace ui {
19 class InputMethodIBus; 19 class InputMethodIBus;
20 } // namespace ui 20 } // namespace ui
21 21
22 namespace chromeos { 22 namespace chromeos {
23 namespace input_method { 23 namespace input_method {
24 24
25 struct InputMethodConfigValue; 25 struct InputMethodConfigValue;
26 struct InputMethodProperty; 26 struct InputMethodProperty;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // Used for making callbacks for PostTask. 84 // Used for making callbacks for PostTask.
85 base::WeakPtrFactory<IBusControllerImpl> weak_ptr_factory_; 85 base::WeakPtrFactory<IBusControllerImpl> weak_ptr_factory_;
86 86
87 DISALLOW_COPY_AND_ASSIGN(IBusControllerImpl); 87 DISALLOW_COPY_AND_ASSIGN(IBusControllerImpl);
88 }; 88 };
89 89
90 } // namespace input_method 90 } // namespace input_method
91 } // namespace chromeos 91 } // namespace chromeos
92 92
93 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_ 93 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698