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

Side by Side Diff: chrome/browser/chromeos/cros/input_method_library.cc

Issue 3035021: Checking in http://codereview.chromium.org/2806070 and http://codereview.chro... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 5 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
« no previous file with comments | « chrome/browser/chromeos/DEPS ('k') | chrome/browser/chromeos/frame/panel_browser_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/cros/input_method_library.h" 5 #include "chrome/browser/chromeos/cros/input_method_library.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "chrome/browser/chrome_thread.h" 10 #include "chrome/browser/chrome_thread.h"
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 const ImeConfigValue& value = iter->second; 161 const ImeConfigValue& value = iter->second;
162 if (chromeos::SetImeConfig(input_method_status_connection_, 162 if (chromeos::SetImeConfig(input_method_status_connection_,
163 section.c_str(), config_name.c_str(), value)) { 163 section.c_str(), config_name.c_str(), value)) {
164 // Successfully sent. Remove the command and proceed to the next one. 164 // Successfully sent. Remove the command and proceed to the next one.
165 pending_config_requests_.erase(iter++); 165 pending_config_requests_.erase(iter++);
166 // Check if it's a change in active input methods. 166 // Check if it's a change in active input methods.
167 if (config_name == kPreloadEnginesConfigName) { 167 if (config_name == kPreloadEnginesConfigName) {
168 active_input_methods_are_changed = true; 168 active_input_methods_are_changed = true;
169 } 169 }
170 } else { 170 } else {
171 LOG(ERROR) << "chromeos::SetImeConfig failed. Will retry later: " 171 // LOG(ERROR) << "chromeos::SetImeConfig failed. Will retry later: "
172 << section << "/" << config_name; 172 // << section << "/" << config_name;
173 ++iter; // Do not remove the command. 173 ++iter; // Do not remove the command.
174 } 174 }
175 } 175 }
176 if (pending_config_requests_.empty()) { 176 if (pending_config_requests_.empty()) {
177 timer_.Stop(); // no-op if it's not running. 177 timer_.Stop(); // no-op if it's not running.
178 } 178 }
179 } else { 179 } else {
180 if (!timer_.IsRunning()) { 180 if (!timer_.IsRunning()) {
181 static const int64 kTimerIntervalInSec = 1; 181 static const int64 kTimerIntervalInSec = 1;
182 timer_.Start(base::TimeDelta::FromSeconds(kTimerIntervalInSec), this, 182 timer_.Start(base::TimeDelta::FromSeconds(kTimerIntervalInSec), this,
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 return; 292 return;
293 } 293 }
294 294
295 for (size_t i = 0; i < prop_list.size(); ++i) { 295 for (size_t i = 0; i < prop_list.size(); ++i) {
296 FindAndUpdateProperty(prop_list[i], &current_ime_properties_); 296 FindAndUpdateProperty(prop_list[i], &current_ime_properties_);
297 } 297 }
298 FOR_EACH_OBSERVER(Observer, observers_, ImePropertiesChanged(this)); 298 FOR_EACH_OBSERVER(Observer, observers_, ImePropertiesChanged(this));
299 } 299 }
300 300
301 } // namespace chromeos 301 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/DEPS ('k') | chrome/browser/chromeos/frame/panel_browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698