chrome/browser/chromeos/input_method/input_method_util.cc - Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_util.h ('k') | chrome/browser/chromeos/input_method/input_method_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/input_method_util.cc

diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc

index 97971601d00109f31cc9f2091f85829bdd351d2a..11f396171916c3e52859310a4a2bfc9fb55b942e 100644

--- a/chrome/browser/chromeos/input_method/input_method_util.cc

+++ b/chrome/browser/chromeos/input_method/input_method_util.cc

@@ -9,26 +9,22 @@

#include <algorithm>

#include <functional>

#include <map>

+#include <memory>

#include <utility>

#include "base/macros.h"

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

#include "base/strings/string_split.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/common/extensions/extension_constants.h"

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

// TODO(nona): move this header from this file.

#include "chrome/grit/generated_resources.h"

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

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

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

// For SetHardwareKeyboardLayoutForTesting.

#include "ui/base/ime/chromeos/fake_input_method_delegate.h"

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

#include "ui/base/l10n/l10n_util.h"

namespace {