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

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_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
Index: chrome/browser/chromeos/input_method/input_method_manager_impl.h
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
index 0142001376ab7d0af743ae32311fec67529f27cd..64d16a9673070cd76232d3768f0ec6e6e995c185 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
@@ -8,11 +8,11 @@
#include <stddef.h>
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/threading/thread_checker.h"
#include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
@@ -95,7 +95,8 @@ class InputMethodManagerImpl : public InputMethodManager,
const std::vector<std::string>& initial_layouts) override;
void EnableLockScreenLayouts() override;
void GetInputMethodExtensions(InputMethodDescriptors* result) override;
- scoped_ptr<InputMethodDescriptors> GetActiveInputMethods() const override;
+ std::unique_ptr<InputMethodDescriptors> GetActiveInputMethods()
+ const override;
const std::vector<std::string>& GetActiveInputMethodIds() const override;
const InputMethodDescriptor* GetInputMethodFromId(
const std::string& input_method_id) const override;
@@ -143,7 +144,7 @@ class InputMethodManagerImpl : public InputMethodManager,
// Constructs an InputMethodManager instance. The client is responsible for
// calling |SetUISessionState| in response to relevant changes in browser
// state.
- InputMethodManagerImpl(scoped_ptr<InputMethodDelegate> delegate,
+ InputMethodManagerImpl(std::unique_ptr<InputMethodDelegate> delegate,
bool enable_extension_loading);
~InputMethodManagerImpl() override;
@@ -162,7 +163,8 @@ class InputMethodManagerImpl : public InputMethodManager,
InputMethodManager::CandidateWindowObserver* observer) override;
void RemoveImeMenuObserver(
InputMethodManager::ImeMenuObserver* observer) override;
- scoped_ptr<InputMethodDescriptors> GetSupportedInputMethods() const override;
+ std::unique_ptr<InputMethodDescriptors> GetSupportedInputMethods()
+ const override;
void ActivateInputMethodMenuItem(const std::string& key) override;
bool IsISOLevel5ShiftUsedByCurrentInputMethod() const override;
bool IsAltGrUsedByCurrentInputMethod() const override;
@@ -196,7 +198,7 @@ class InputMethodManagerImpl : public InputMethodManager,
void SetImeKeyboardForTesting(ImeKeyboard* keyboard);
// Initialize |component_extension_manager_|.
void InitializeComponentExtensionForTesting(
- scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate);
+ std::unique_ptr<ComponentExtensionIMEManagerDelegate> delegate);
private:
friend class InputMethodManagerImplTest;
@@ -251,7 +253,7 @@ class InputMethodManagerImpl : public InputMethodManager,
// changed.
void NotifyImeMenuListChanged();
- scoped_ptr<InputMethodDelegate> delegate_;
+ std::unique_ptr<InputMethodDelegate> delegate_;
// The current UI session status.
UISessionState ui_session_;
@@ -265,18 +267,19 @@ class InputMethodManagerImpl : public InputMethodManager,
// The candidate window. This will be deleted when the APP_TERMINATING
// message is sent.
- scoped_ptr<CandidateWindowController> candidate_window_controller_;
+ std::unique_ptr<CandidateWindowController> candidate_window_controller_;
// An object which provides miscellaneous input method utility functions. Note
// that |util_| is required to initialize |keyboard_|.
InputMethodUtil util_;
// An object which provides component extension ime management functions.
- scoped_ptr<ComponentExtensionIMEManager> component_extension_ime_manager_;
+ std::unique_ptr<ComponentExtensionIMEManager>
+ component_extension_ime_manager_;
// An object for switching XKB layouts and keyboard status like caps lock and
// auto-repeat interval.
- scoped_ptr<ImeKeyboard> keyboard_;
+ std::unique_ptr<ImeKeyboard> keyboard_;
// Whether load IME extensions.
bool enable_extension_loading_;

Powered by Google App Engine
This is Rietveld 408576698