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

Unified Diff: components/arc/intent_helper/link_handler_model_impl.cc

Issue 2498223002: arc: enable use_new_wrapper_types for intent_helper.mojom (Closed)
Patch Set: rebase Created 4 years, 1 month 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: components/arc/intent_helper/link_handler_model_impl.cc
diff --git a/components/arc/intent_helper/link_handler_model_impl.cc b/components/arc/intent_helper/link_handler_model_impl.cc
index c20d20633ca170fb1094ccae1bcba2302d76a6a5..5bf0193bb5775deea036c24ba7dbf87b31425c77 100644
--- a/components/arc/intent_helper/link_handler_model_impl.cc
+++ b/components/arc/intent_helper/link_handler_model_impl.cc
@@ -6,7 +6,6 @@
#include <string>
#include <utility>
-#include <vector>
#include "base/bind.h"
#include "components/arc/arc_bridge_service.h"
@@ -89,7 +88,7 @@ void LinkHandlerModelImpl::OpenLinkWithHandler(const GURL& url,
}
void LinkHandlerModelImpl::OnUrlHandlerList(
- mojo::Array<mojom::IntentHandlerInfoPtr> handlers) {
+ std::vector<mojom::IntentHandlerInfoPtr> handlers) {
handlers_ = ArcIntentHelperBridge::FilterOutIntentHelper(std::move(handlers));
bool icon_info_notified = false;
@@ -129,7 +128,7 @@ void LinkHandlerModelImpl::NotifyObserver(
if (it != icons_.end())
icon = it->second.icon16;
// Use the handler's index as an ID.
- ash::LinkHandlerInfo handler = {handlers_[i]->name.get(), icon, i};
+ ash::LinkHandlerInfo handler = {handlers_[i]->name, icon, i};
handlers.push_back(handler);
}
for (auto& observer : observer_list_)
« no previous file with comments | « components/arc/intent_helper/link_handler_model_impl.h ('k') | components/arc/intent_helper/local_activity_resolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698