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

Side by Side Diff: chrome/browser/chromeos/preferences.h

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 #ifndef CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
6 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 6 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/shell_observer.h" 11 #include "ash/shell_observer.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/prefs/pref_member.h" 13 #include "base/prefs/pref_member.h"
14 #include "chrome/browser/chromeos/language_preferences.h" 14 #include "chrome/browser/chromeos/language_preferences.h"
15 #include "chrome/browser/prefs/pref_service_syncable_observer.h" 15 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
16 #include "chromeos/ime/input_method_manager.h"
17 #include "components/user_manager/user_manager.h" 16 #include "components/user_manager/user_manager.h"
17 #include "ui/base/ime/chromeos/input_method_manager.h"
18 18
19 class PrefRegistrySimple; 19 class PrefRegistrySimple;
20 class PrefService; 20 class PrefService;
21 class PrefServiceSyncable; 21 class PrefServiceSyncable;
22 22
23 class TracingManager; 23 class TracingManager;
24 24
25 namespace user_prefs { 25 namespace user_prefs {
26 class PrefRegistrySyncable; 26 class PrefRegistrySyncable;
27 } 27 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 150
151 // Input Methods state for this user. 151 // Input Methods state for this user.
152 scoped_refptr<input_method::InputMethodManager::State> ime_state_; 152 scoped_refptr<input_method::InputMethodManager::State> ime_state_;
153 153
154 DISALLOW_COPY_AND_ASSIGN(Preferences); 154 DISALLOW_COPY_AND_ASSIGN(Preferences);
155 }; 155 };
156 156
157 } // namespace chromeos 157 } // namespace chromeos
158 158
159 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 159 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_browsertest.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698