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

Side by Side Diff: ui/base/ime/input_method_factory.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 unified diff | Download patch
« no previous file with comments | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ime/input_method_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef UI_BASE_IME_INPUT_METHOD_FACTORY_H_ 5 #ifndef UI_BASE_IME_INPUT_METHOD_FACTORY_H_
6 #define UI_BASE_IME_INPUT_METHOD_FACTORY_H_ 6 #define UI_BASE_IME_INPUT_METHOD_FACTORY_H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "ui/base/ime/input_method_initializer.h" 11 #include "ui/base/ime/input_method_initializer.h"
11 #include "ui/base/ime/ui_base_ime_export.h" 12 #include "ui/base/ime/ui_base_ime_export.h"
12 #include "ui/gfx/native_widget_types.h" 13 #include "ui/gfx/native_widget_types.h"
13 14
14 namespace ui { 15 namespace ui {
15 namespace internal { 16 namespace internal {
16 class InputMethodDelegate; 17 class InputMethodDelegate;
17 } // namespace internal 18 } // namespace internal
18 19
19 class InputMethod; 20 class InputMethod;
20 21
21 // Creates a new instance of InputMethod and returns it. 22 // Creates a new instance of InputMethod and returns it.
22 UI_BASE_IME_EXPORT scoped_ptr<InputMethod> CreateInputMethod( 23 UI_BASE_IME_EXPORT std::unique_ptr<InputMethod> CreateInputMethod(
23 internal::InputMethodDelegate* delegate, 24 internal::InputMethodDelegate* delegate,
24 gfx::AcceleratedWidget widget); 25 gfx::AcceleratedWidget widget);
25 26
26 // Makes CreateInputMethod return a MockInputMethod. 27 // Makes CreateInputMethod return a MockInputMethod.
27 UI_BASE_IME_EXPORT void SetUpInputMethodFactoryForTesting(); 28 UI_BASE_IME_EXPORT void SetUpInputMethodFactoryForTesting();
28 UI_BASE_IME_EXPORT void SetUpInputMethodForTesting(InputMethod* input_method); 29 UI_BASE_IME_EXPORT void SetUpInputMethodForTesting(InputMethod* input_method);
29 30
30 } // namespace ui; 31 } // namespace ui;
31 32
32 #endif // UI_BASE_IME_INPUT_METHOD_FACTORY_H_ 33 #endif // UI_BASE_IME_INPUT_METHOD_FACTORY_H_
OLDNEW
« no previous file with comments | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ime/input_method_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698