chrome/browser/chromeos/input_method/candidate_window_controller_impl.h - 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/candidate_window_controller_impl.h

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/first_run/step.cc ('k') | chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

index df6b46825822250a43fa5e1a9b209a4addcd61b2..a66ca0d8e0e78c23340f4bab8238503f8800c183 100644

--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

@@ -5,11 +5,11 @@

#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_

#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_

-#include "chrome/browser/chromeos/input_method/candidate_window_controller.h"

+#include <memory>

#include "base/macros.h"

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

#include "base/observer_list.h"

+#include "chrome/browser/chromeos/input_method/candidate_window_controller.h"

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

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

#include "ui/chromeos/ime/candidate_window_view.h"

@@ -84,7 +84,7 @@ class CandidateWindowControllerImpl

gfx::Rect composition_head_;

// This is the controller of the IME mode indicator.

- scoped_ptr<ModeIndicatorController> mode_indicator_controller_;

+ std::unique_ptr<ModeIndicatorController> mode_indicator_controller_;

// The infolist entries and its focused index which currently shown in

// Infolist window.