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

Unified Diff: ui/base/ime/chromeos/input_method_whitelist.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/input_method_manager.h ('k') | ui/base/ime/chromeos/input_method_whitelist.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/chromeos/input_method_whitelist.h
diff --git a/ui/base/ime/chromeos/input_method_whitelist.h b/ui/base/ime/chromeos/input_method_whitelist.h
index 59154dddc1ef217a1e38538d5d0d2bffebbf38af..c42fd5a4c67201342dfad43becc0228fc40467b4 100644
--- a/ui/base/ime/chromeos/input_method_whitelist.h
+++ b/ui/base/ime/chromeos/input_method_whitelist.h
@@ -5,12 +5,12 @@
#ifndef UI_BASE_IME_CHROMEOS_INPUT_METHOD_WHITELIST_H_
#define UI_BASE_IME_CHROMEOS_INPUT_METHOD_WHITELIST_H_
+#include <memory>
#include <set>
#include <string>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/base/ime/ui_base_ime_export.h"
namespace chromeos {
@@ -32,7 +32,7 @@ class UI_BASE_IME_EXPORT InputMethodWhitelist {
// Returns all input methods that are supported, including ones not active.
// This function never returns NULL. Note that input method extensions are not
// included in the result.
- scoped_ptr<InputMethodDescriptors> GetSupportedInputMethods() const;
+ std::unique_ptr<InputMethodDescriptors> GetSupportedInputMethods() const;
private:
std::set<std::string> supported_input_methods_;
« no previous file with comments | « ui/base/ime/chromeos/input_method_manager.h ('k') | ui/base/ime/chromeos/input_method_whitelist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698