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

Unified Diff: chrome/browser/chromeos/preferences_unittest.cc

Issue 419293002: IME refactoring: ChromeOS introduce input methods State. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 6 years, 4 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_unittest.cc
diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc
index 0f444d06c79522531b6cce3bb9c966af4912ef67..86f78da0f3d9e8458db241b9f491dbb05ca52eae 100644
--- a/chrome/browser/chromeos/preferences_unittest.cc
+++ b/chrome/browser/chromeos/preferences_unittest.cc
@@ -19,23 +19,35 @@ namespace {
class MyMockInputMethodManager : public input_method::MockInputMethodManager {
public:
+ class State : public MockInputMethodManager::State {
+ public:
+ explicit State(MyMockInputMethodManager* manager) : manager_(manager) {};
+ virtual ~State() {};
+
+ virtual void ChangeInputMethod(const std::string& input_method_id,
+ bool show_message) OVERRIDE {
+ manager_->last_input_method_id_ = input_method_id;
+ // Do the same thing as BrowserStateMonitor::UpdateUserPreferences.
+ const std::string current_input_method_on_pref =
+ manager_->current_->GetValue();
+ if (current_input_method_on_pref == input_method_id)
+ return;
+ manager_->previous_->SetValue(current_input_method_on_pref);
+ manager_->current_->SetValue(input_method_id);
+ }
+
+ private:
+ MyMockInputMethodManager* const manager_;
+ };
+
MyMockInputMethodManager(StringPrefMember* previous,
StringPrefMember* current)
: previous_(previous),
current_(current) {
- }
- virtual ~MyMockInputMethodManager() {
+ state_ = new State(this);
}
- virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE {
- last_input_method_id_ = input_method_id;
- // Do the same thing as BrowserStateMonitor::UpdateUserPreferences.
- const std::string current_input_method_on_pref = current_->GetValue();
- if (current_input_method_on_pref == input_method_id)
- return;
- previous_->SetValue(current_input_method_on_pref);
- current_->SetValue(input_method_id);
- }
+ virtual ~MyMockInputMethodManager() {}
std::string last_input_method_id_;

Powered by Google App Engine
This is Rietveld 408576698