chrome/browser/chromeos/input_method/input_method_manager_impl.cc - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_delegate_impl.cc ('k') | chrome/browser/chromeos/input_method/input_method_persistence.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_manager_impl.h"	5 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"

6	6

7 #include <stdint.h>	7 #include <stdint.h>

8 #include <algorithm> // std::find	8 #include <algorithm> // std::find

9 #include <sstream>	9 #include <sstream>

10 #include <utility>	10 #include <utility>

11	11

12 #include "base/bind.h"	12 #include "base/bind.h"

13 #include "base/hash.h"	13 #include "base/hash.h"

14 #include "base/location.h"	14 #include "base/location.h"

15 #include "base/memory/scoped_ptr.h"	15 #include "base/memory/scoped_ptr.h"

16 #include "base/metrics/histogram.h"	16 #include "base/metrics/histogram.h"

17 #include "base/metrics/sparse_histogram.h"	17 #include "base/metrics/sparse_histogram.h"

18 #include "base/prefs/pref_service.h"

19 #include "base/strings/string_split.h"	18 #include "base/strings/string_split.h"

20 #include "base/strings/string_util.h"	19 #include "base/strings/string_util.h"

21 #include "base/strings/stringprintf.h"	20 #include "base/strings/stringprintf.h"

22 #include "base/sys_info.h"	21 #include "base/sys_info.h"

23 #include "chrome/browser/browser_process.h"	22 #include "chrome/browser/browser_process.h"

24 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"	23 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"

25 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_i mpl.h"	24 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_i mpl.h"

26 #include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h"	25 #include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h"

27 #include "chrome/browser/chromeos/language_preferences.h"	26 #include "chrome/browser/chromeos/language_preferences.h"

28 #include "chrome/browser/chromeos/login/session/user_session_manager.h"	27 #include "chrome/browser/chromeos/login/session/user_session_manager.h"

29 #include "chrome/browser/chromeos/profiles/profile_helper.h"	28 #include "chrome/browser/chromeos/profiles/profile_helper.h"

30 #include "chrome/browser/profiles/profile_manager.h"	29 #include "chrome/browser/profiles/profile_manager.h"

31 #include "chrome/common/pref_names.h"	30 #include "chrome/common/pref_names.h"

	31 #include "components/prefs/pref_service.h"

32 #include "components/user_manager/user_manager.h"	32 #include "components/user_manager/user_manager.h"

33 #include "third_party/icu/source/common/unicode/uloc.h"	33 #include "third_party/icu/source/common/unicode/uloc.h"

34 #include "ui/base/accelerators/accelerator.h"	34 #include "ui/base/accelerators/accelerator.h"

35 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"	35 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"

36 #include "ui/base/ime/chromeos/extension_ime_util.h"	36 #include "ui/base/ime/chromeos/extension_ime_util.h"

37 #include "ui/base/ime/chromeos/fake_ime_keyboard.h"	37 #include "ui/base/ime/chromeos/fake_ime_keyboard.h"

38 #include "ui/base/ime/chromeos/ime_keyboard.h"	38 #include "ui/base/ime/chromeos/ime_keyboard.h"

39 #include "ui/base/ime/chromeos/input_method_delegate.h"	39 #include "ui/base/ime/chromeos/input_method_delegate.h"

40 #include "ui/base/ime/ime_bridge.h"	40 #include "ui/base/ime/ime_bridge.h"

41 #include "ui/chromeos/ime/input_method_menu_item.h"	41 #include "ui/chromeos/ime/input_method_menu_item.h"

(...skipping 1115 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1157 if (candidate_window_controller_.get())	1157 if (candidate_window_controller_.get())

1158 return;	1158 return;

1159	1159

1160 candidate_window_controller_.reset(	1160 candidate_window_controller_.reset(

1161 CandidateWindowController::CreateCandidateWindowController());	1161 CandidateWindowController::CreateCandidateWindowController());

1162 candidate_window_controller_->AddObserver(this);	1162 candidate_window_controller_->AddObserver(this);

1163 }	1163 }

1164	1164

1165 } // namespace input_method	1165 } // namespace input_method

1166 } // namespace chromeos	1166 } // namespace chromeos

OLD	NEW