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

Unified Diff: chrome/browser/chromeos/preferences.h

Issue 312023002: Sync starting language and input method preferences (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored for xkb refactor Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/preferences.h
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index ab6fd3cc1af5a185ea52dadc5a3fab0f8fd1173f..941974ea85ad8e7cde999224cef9c6c058599209 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -6,10 +6,10 @@
#define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
#include <string>
-#include <vector>
#include "ash/shell_observer.h"
#include "base/compiler_specific.h"
+#include "base/memory/weak_ptr.h"
#include "base/prefs/pref_member.h"
#include "chrome/browser/chromeos/language_preferences.h"
#include "chrome/browser/prefs/pref_service_syncable_observer.h"
@@ -30,6 +30,10 @@ namespace chromeos {
class User;
+namespace {
+class InputMethodSyncer;
+}
+
namespace input_method {
class InputMethodManager;
}
@@ -149,6 +153,8 @@ class Preferences : public PrefServiceSyncableObserver,
// Input Methods state for this user.
scoped_refptr<input_method::InputMethodManager::State> ime_state_;
+ scoped_ptr<InputMethodSyncer> input_method_syncer_;
+
DISALLOW_COPY_AND_ASSIGN(Preferences);
};

Powered by Google App Engine
This is Rietveld 408576698