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

Unified Diff: chrome/browser/chromeos/input_method/input_method_configuration.cc

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
Index: chrome/browser/chromeos/input_method/input_method_configuration.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_configuration.cc b/chrome/browser/chromeos/input_method/input_method_configuration.cc
index 7244b7f93f4180b21febfbfe700365a20b929041..c6fb037f4e62d851302de7544830a335ad28a106 100644
--- a/chrome/browser/chromeos/input_method/input_method_configuration.cc
+++ b/chrome/browser/chromeos/input_method/input_method_configuration.cc
@@ -4,9 +4,10 @@
#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
+#include <memory>
+
#include "base/bind.h"
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/input_method/accessibility.h"
#include "chrome/browser/chromeos/input_method/browser_state_monitor.h"
#include "chrome/browser/chromeos/input_method/input_method_delegate_impl.h"
@@ -36,7 +37,7 @@ class InputMethodConfiguration {
ui::IMEBridge::Initialize();
InputMethodManagerImpl* impl = new InputMethodManagerImpl(
- scoped_ptr<InputMethodDelegate>(new InputMethodDelegateImpl),
+ std::unique_ptr<InputMethodDelegate>(new InputMethodDelegateImpl),
!g_disable_extension_loading);
InputMethodManager::Initialize(impl);
@@ -70,9 +71,9 @@ class InputMethodConfiguration {
}
private:
- scoped_ptr<Accessibility> accessibility_;
- scoped_ptr<BrowserStateMonitor> browser_state_monitor_;
- scoped_ptr<InputMethodPersistence> input_method_persistence_;
+ std::unique_ptr<Accessibility> accessibility_;
+ std::unique_ptr<BrowserStateMonitor> browser_state_monitor_;
+ std::unique_ptr<InputMethodPersistence> input_method_persistence_;
};
InputMethodConfiguration* g_input_method_configuration = NULL;

Powered by Google App Engine
This is Rietveld 408576698