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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_syncer.cc

Issue 2694813005: Revert of Remove header dependencies from sequence_checker.h to sequenced_worker_pool.h (Closed)
Patch Set: Created 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_syncer.h" 5 #include "chrome/browser/chromeos/input_method/input_method_syncer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/strings/string_split.h" 12 #include "base/strings/string_split.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/task_runner.h" 14 #include "base/task_runner.h"
15 #include "base/task_runner_util.h" 15 #include "base/task_runner_util.h"
16 #include "base/threading/sequenced_worker_pool.h"
17 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
18 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
19 #include "components/pref_registry/pref_registry_syncable.h" 18 #include "components/pref_registry/pref_registry_syncable.h"
20 #include "components/sync_preferences/pref_service_syncable.h" 19 #include "components/sync_preferences/pref_service_syncable.h"
21 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
22 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" 21 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
23 #include "ui/base/ime/chromeos/extension_ime_util.h" 22 #include "ui/base/ime/chromeos/extension_ime_util.h"
24 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
25 24
26 namespace chromeos { 25 namespace chromeos {
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 322
324 void InputMethodSyncer::OnIsSyncingChanged() { 323 void InputMethodSyncer::OnIsSyncingChanged() {
325 if (prefs_->GetBoolean(prefs::kLanguageShouldMergeInputMethods) && 324 if (prefs_->GetBoolean(prefs::kLanguageShouldMergeInputMethods) &&
326 prefs_->IsSyncing()) { 325 prefs_->IsSyncing()) {
327 MergeSyncedPrefs(); 326 MergeSyncedPrefs();
328 } 327 }
329 } 328 }
330 329
331 } // namespace input_method 330 } // namespace input_method
332 } // namespace chromeos 331 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698