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

Side by Side Diff: trunk/src/chrome/browser/chromeos/input_method/input_method_persistence.cc

Issue 165453002: Revert 251164 "Split out InputMethodMenuManager from InputMethod..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
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 #include "chrome/browser/chromeos/input_method/input_method_persistence.h" 5 #include "chrome/browser/chromeos/input_method/input_method_persistence.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/prefs/scoped_user_pref_update.h" 9 #include "base/prefs/scoped_user_pref_update.h"
10 #include "base/sys_info.h" 10 #include "base/sys_info.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 return; 135 return;
136 case InputMethodManager::STATE_LOCK_SCREEN: 136 case InputMethodManager::STATE_LOCK_SCREEN:
137 // We use a special set of input methods on the screen. Do not update. 137 // We use a special set of input methods on the screen. Do not update.
138 return; 138 return;
139 case InputMethodManager::STATE_TERMINATING: 139 case InputMethodManager::STATE_TERMINATING:
140 return; 140 return;
141 } 141 }
142 NOTREACHED(); 142 NOTREACHED();
143 } 143 }
144 144
145 void InputMethodPersistence::InputMethodPropertyChanged(
146 InputMethodManager* manager) {}
147
145 void InputMethodPersistence::OnSessionStateChange( 148 void InputMethodPersistence::OnSessionStateChange(
146 InputMethodManager::State new_state) { 149 InputMethodManager::State new_state) {
147 state_ = new_state; 150 state_ = new_state;
148 } 151 }
149 152
150 } // namespace input_method 153 } // namespace input_method
151 } // namespace chromeos 154 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698