ui/base/ime/chromeos/ime_keyboard_x11.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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: ui/base/ime/chromeos/ime_keyboard_x11.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc ('k') | ui/base/ime/chromeos/ime_keyboard_x11_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/base/ime/chromeos/ime_keyboard_x11.h

diff --git a/ui/base/ime/chromeos/ime_keyboard_x11.h b/ui/base/ime/chromeos/ime_keyboard_x11.h

index efc6b8666fde16a19723e9ae2b696acd4f589c08..caf7941b7445018fd930512ba6faaa5ac165e922 100644

--- a/ui/base/ime/chromeos/ime_keyboard_x11.h

+++ b/ui/base/ime/chromeos/ime_keyboard_x11.h

@@ -5,10 +5,9 @@

#ifndef UI_BASE_IME_CHROMEOS_IME_KEYBOARD_X11_H_

#define UI_BASE_IME_CHROMEOS_IME_KEYBOARD_X11_H_

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

#include <cstdlib>

#include <cstring>

+#include <memory>

#include <queue>

#include <set>

#include <utility>

@@ -16,7 +15,6 @@

#include "base/bind.h"

#include "base/logging.h"

#include "base/macros.h"

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

#include "base/message_loop/message_loop.h"

#include "base/process/kill.h"

#include "base/process/launch.h"

@@ -25,6 +23,7 @@

#include "base/strings/stringprintf.h"

#include "base/sys_info.h"

#include "base/threading/thread_checker.h"

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

#include "ui/base/ime/ui_base_ime_export.h"

namespace chromeos {