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

Unified Diff: ios/web/webui/web_ui_ios_impl.h

Issue 2617243002: Remove ScopedVector from ios/. (Closed)
Patch Set: rebase Created 3 years, 11 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 | « ios/web/webui/crw_web_ui_manager.mm ('k') | ios/web/webui/web_ui_ios_impl.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/webui/web_ui_ios_impl.h
diff --git a/ios/web/webui/web_ui_ios_impl.h b/ios/web/webui/web_ui_ios_impl.h
index ca83b9ebde3d801431fe2d93045eac640c351d7d..7440cdbbda9eebfe2cf15347c69ad2c3a38e388b 100644
--- a/ios/web/webui/web_ui_ios_impl.h
+++ b/ios/web/webui/web_ui_ios_impl.h
@@ -7,10 +7,10 @@
#include <map>
#include <memory>
+#include <vector>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "ios/web/public/webui/web_ui_ios.h"
@@ -30,7 +30,8 @@ class WebUIIOSImpl : public web::WebUIIOS,
WebState* GetWebState() const override;
WebUIIOSController* GetController() const override;
void SetController(WebUIIOSController* controller) override;
- void AddMessageHandler(WebUIIOSMessageHandler* handler) override;
+ void AddMessageHandler(
+ std::unique_ptr<WebUIIOSMessageHandler> handler) override;
typedef base::Callback<void(const base::ListValue*)> MessageCallback;
void RegisterMessageCallback(const std::string& message,
const MessageCallback& callback) override;
@@ -65,7 +66,7 @@ class WebUIIOSImpl : public web::WebUIIOS,
MessageCallbackMap message_callbacks_;
// The WebUIIOSMessageHandlers we own.
- ScopedVector<WebUIIOSMessageHandler> handlers_;
+ std::vector<std::unique_ptr<WebUIIOSMessageHandler>> handlers_;
// Non-owning pointer to the WebStateImpl this WebUIIOS is associated with.
WebStateImpl* web_state_;
« no previous file with comments | « ios/web/webui/crw_web_ui_manager.mm ('k') | ios/web/webui/web_ui_ios_impl.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698