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

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: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/users/fake_user_manager.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/preferences.h
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index b0d8c9ae88cfed5f422fdc4783d88e6ae2d14ec0..88d861a91ab0774416cc89c0595d34acebf4312a 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
#include <string>
-#include <vector>
#include "ash/shell_observer.h"
#include "base/compiler_specific.h"
@@ -32,6 +31,7 @@ class User;
namespace input_method {
class InputMethodManager;
+class InputMethodSyncer;
}
// The Preferences class handles Chrome OS preferences. When the class
@@ -151,6 +151,8 @@ class Preferences : public PrefServiceSyncableObserver,
// Input Methods state for this user.
scoped_refptr<input_method::InputMethodManager::State> ime_state_;
+ scoped_ptr<input_method::InputMethodSyncer> input_method_syncer_;
+
DISALLOW_COPY_AND_ASSIGN(Preferences);
};
« no previous file with comments | « chrome/browser/chromeos/login/users/fake_user_manager.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698