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

Unified Diff: components/arc/ime/arc_ime_service.h

Issue 1921973002: Convert //components/[a-e]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 | « components/arc/bluetooth/arc_bluetooth_bridge.cc ('k') | components/arc/ime/arc_ime_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/ime/arc_ime_service.h
diff --git a/components/arc/ime/arc_ime_service.h b/components/arc/ime/arc_ime_service.h
index a5b95a1401457d183a005c87796a175842481f2a..3e81db4b1340e8d2b0d722ae6cc53e8694fec98f 100644
--- a/components/arc/ime/arc_ime_service.h
+++ b/components/arc/ime/arc_ime_service.h
@@ -5,8 +5,9 @@
#ifndef COMPONENTS_ARC_IME_ARC_IME_SERVICE_H_
#define COMPONENTS_ARC_IME_ARC_IME_SERVICE_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/arc/arc_service.h"
#include "components/arc/ime/arc_ime_bridge.h"
#include "ui/aura/client/focus_change_observer.h"
@@ -43,7 +44,7 @@ class ArcImeService : public ArcService,
~ArcImeService() override;
// Injects the custom IPC bridge object for testing purpose only.
- void SetImeBridgeForTesting(scoped_ptr<ArcImeBridge> test_ime_bridge);
+ void SetImeBridgeForTesting(std::unique_ptr<ArcImeBridge> test_ime_bridge);
// Injects the custom IME for testing purpose only.
void SetInputMethodForTesting(ui::InputMethod* test_input_method);
@@ -99,7 +100,7 @@ class ArcImeService : public ArcService,
private:
ui::InputMethod* GetInputMethod();
- scoped_ptr<ArcImeBridge> ime_bridge_;
+ std::unique_ptr<ArcImeBridge> ime_bridge_;
ui::TextInputType ime_type_;
gfx::Rect cursor_rect_;
bool has_composition_text_;
« no previous file with comments | « components/arc/bluetooth/arc_bluetooth_bridge.cc ('k') | components/arc/ime/arc_ime_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698