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

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

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 (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_util.h" 5 #include "chrome/browser/chromeos/input_method/input_method_util.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <functional> 10 #include <functional>
11 #include <map> 11 #include <map>
12 #include <memory>
12 #include <utility> 13 #include <utility>
13 14
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/strings/string_split.h" 16 #include "base/strings/string_split.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "chrome/common/extensions/extension_constants.h" 19 #include "chrome/common/extensions/extension_constants.h"
20 #include "components/prefs/pref_service.h"
21
22 // TODO(nona): move this header from this file. 20 // TODO(nona): move this header from this file.
23 #include "chrome/grit/generated_resources.h" 21 #include "chrome/grit/generated_resources.h"
24 22 #include "components/prefs/pref_service.h"
25 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" 23 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
26 #include "ui/base/ime/chromeos/extension_ime_util.h" 24 #include "ui/base/ime/chromeos/extension_ime_util.h"
27
28 // For SetHardwareKeyboardLayoutForTesting. 25 // For SetHardwareKeyboardLayoutForTesting.
29 #include "ui/base/ime/chromeos/fake_input_method_delegate.h" 26 #include "ui/base/ime/chromeos/fake_input_method_delegate.h"
30 #include "ui/base/ime/chromeos/input_method_delegate.h" 27 #include "ui/base/ime/chromeos/input_method_delegate.h"
31
32 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
33 29
34 namespace { 30 namespace {
35 31
36 // A mapping from an input method id to a resource id for a 32 // A mapping from an input method id to a resource id for a
37 // medium length language indicator. 33 // medium length language indicator.
38 // For those languages that want to display a slightly longer text in the 34 // For those languages that want to display a slightly longer text in the
39 // "Your input method has changed to..." bubble than in the status tray. 35 // "Your input method has changed to..." bubble than in the status tray.
40 // If an entry is not found in this table the short name is used. 36 // If an entry is not found in this table the short name is used.
41 const struct { 37 const struct {
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 "US", 822 "US",
827 layouts, 823 layouts,
828 languages, 824 languages,
829 true, // login keyboard. 825 true, // login keyboard.
830 GURL(), // options page, not available. 826 GURL(), // options page, not available.
831 GURL()); // input view page, not available. 827 GURL()); // input view page, not available.
832 } 828 }
833 829
834 } // namespace input_method 830 } // namespace input_method
835 } // namespace chromeos 831 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698