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

Unified Diff: chrome/browser/chromeos/input_method/mock_input_method_manager.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/mock_input_method_manager.h
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.h b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
index 603daa4592492bfe041fb2146a5c8b8677df1400..ee56c43d8f4898c31c79b5209778c2e12a55cf32 100644
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
@@ -40,7 +40,8 @@ class MockInputMethodManager : 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;
@@ -86,7 +87,8 @@ class MockInputMethodManager : 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;
@@ -108,7 +110,7 @@ class MockInputMethodManager : public InputMethodManager {
void SetCurrentInputMethodId(const std::string& input_method_id);
void SetComponentExtensionIMEManager(
- scoped_ptr<ComponentExtensionIMEManager> comp_ime_manager);
+ std::unique_ptr<ComponentExtensionIMEManager> comp_ime_manager);
// Set values that will be provided to the InputMethodUtil.
void set_application_locale(const std::string& value);
@@ -128,7 +130,7 @@ class MockInputMethodManager : public InputMethodManager {
InputMethodUtil util_;
FakeImeKeyboard keyboard_;
bool mod3_used_;
- scoped_ptr<ComponentExtensionIMEManager> comp_ime_manager_;
+ std::unique_ptr<ComponentExtensionIMEManager> comp_ime_manager_;
DISALLOW_COPY_AND_ASSIGN(MockInputMethodManager);
};

Powered by Google App Engine
This is Rietveld 408576698