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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_syncer.h

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SYNCER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_SYNCER_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_SYNCER_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_SYNCER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/prefs/pref_member.h" 12 #include "components/prefs/pref_member.h"
13 #include "components/syncable_prefs/pref_service_syncable_observer.h" 13 #include "components/syncable_prefs/pref_service_syncable_observer.h"
14 #include "ui/base/ime/chromeos/input_method_manager.h" 14 #include "ui/base/ime/chromeos/input_method_manager.h"
15 15
16 namespace syncable_prefs { 16 namespace syncable_prefs {
17 class PrefServiceSyncable; 17 class PrefServiceSyncable;
18 } 18 }
19 19
20 namespace user_prefs { 20 namespace user_prefs {
21 class PrefRegistrySyncable; 21 class PrefRegistrySyncable;
22 } 22 }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // Used to ignore PrefChanged events while InputMethodManager is merging. 85 // Used to ignore PrefChanged events while InputMethodManager is merging.
86 bool merging_; 86 bool merging_;
87 87
88 base::WeakPtrFactory<InputMethodSyncer> weak_factory_; 88 base::WeakPtrFactory<InputMethodSyncer> weak_factory_;
89 }; 89 };
90 90
91 } // namespace input_method 91 } // namespace input_method
92 } // namespace chromeos 92 } // namespace chromeos
93 93
94 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_SYNCER_H_ 94 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_SYNCER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698