ui/events/ozone/layout/keyboard_layout_engine_manager.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/events/ozone/layout/keyboard_layout_engine_manager.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/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc ('k') | ui/events/ozone/layout/keyboard_layout_engine_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/ozone/layout/keyboard_layout_engine_manager.h

diff --git a/ui/events/ozone/layout/keyboard_layout_engine_manager.h b/ui/events/ozone/layout/keyboard_layout_engine_manager.h

index b63e2e161bad486746b677d41ae4c0db666083ff..641ca816ec7e694306e42a3912cda68ef6cbaee0 100644

--- a/ui/events/ozone/layout/keyboard_layout_engine_manager.h

+++ b/ui/events/ozone/layout/keyboard_layout_engine_manager.h

@@ -5,8 +5,9 @@

#ifndef UI_OZONE_PUBLIC_KEYBOARD_LAYOUT_ENGINE_MANAGER_H_

#define UI_OZONE_PUBLIC_KEYBOARD_LAYOUT_ENGINE_MANAGER_H_

+#include <memory>

#include "base/macros.h"

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

#include "ui/events/ozone/layout/events_ozone_layout_export.h"

namespace ui {

@@ -17,14 +18,15 @@ class EVENTS_OZONE_LAYOUT_EXPORT KeyboardLayoutEngineManager {

public:

virtual ~KeyboardLayoutEngineManager();

- static void SetKeyboardLayoutEngine(scoped_ptr<KeyboardLayoutEngine> engine);

+ static void SetKeyboardLayoutEngine(

+ std::unique_ptr<KeyboardLayoutEngine> engine);

static KeyboardLayoutEngine* GetKeyboardLayoutEngine();

private:

KeyboardLayoutEngineManager(KeyboardLayoutEngine* engine);

static KeyboardLayoutEngineManager* instance_;

- scoped_ptr<KeyboardLayoutEngine> keyboard_layout_engine_;

+ std::unique_ptr<KeyboardLayoutEngine> keyboard_layout_engine_;

DISALLOW_COPY_AND_ASSIGN(KeyboardLayoutEngineManager);

};