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

Unified Diff: components/password_manager/content/public/cpp/type_converters.cc

Issue 2083433002: Mojo: Remove url type converters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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: components/password_manager/content/public/cpp/type_converters.cc
diff --git a/components/password_manager/content/public/cpp/type_converters.cc b/components/password_manager/content/public/cpp/type_converters.cc
index a4f9ef2b265cc9b8a245b4d88bdccdc7e4d7e6d4..3c4b2af4cfc1a240153eaee720965e034f09df29 100644
--- a/components/password_manager/content/public/cpp/type_converters.cc
+++ b/components/password_manager/content/public/cpp/type_converters.cc
@@ -7,7 +7,6 @@
#include "base/logging.h"
#include "components/password_manager/core/common/credential_manager_types.h"
#include "mojo/common/common_type_converters.h"
-#include "mojo/common/url_type_converters.h"
#include "third_party/WebKit/public/platform/WebCredential.h"
#include "third_party/WebKit/public/platform/WebFederatedCredential.h"
#include "third_party/WebKit/public/platform/WebPasswordCredential.h"
@@ -55,7 +54,7 @@ TypeConverter<mojom::CredentialInfoPtr, CredentialInfo>::Convert(
output->type = CMCredentialTypeToMojo(input.type);
output->id = mojo::String::From(input.id);
output->name = mojo::String::From(input.name);
- output->icon = mojo::String::From(input.icon);
+ output->icon = input.icon;
output->password = mojo::String::From(input.password);
output->federation = input.federation;
@@ -68,7 +67,7 @@ CredentialInfo TypeConverter<CredentialInfo, mojom::CredentialInfoPtr>::Convert(
output.type = MojoCredentialTypeToCM(input->type);
output.id = input->id.To<base::string16>();
output.name = input->name.To<base::string16>();
- output.icon = input->icon.To<GURL>();
+ output.icon = input->icon;
output.password = input->password.To<base::string16>();
output.federation = input->federation;
@@ -94,7 +93,7 @@ TypeConverter<mojom::CredentialInfoPtr, blink::WebCredential>::Convert(
}
output->id = mojo::String::From(base::string16(input.id()));
output->name = mojo::String::From(base::string16(input.name()));
- output->icon = mojo::String::From(GURL(input.iconURL()));
+ output->icon = input.iconURL();
return output;
}
@@ -108,12 +107,12 @@ std::unique_ptr<blink::WebCredential> TypeConverter<
case mojom::CredentialType::PASSWORD:
output.reset(new blink::WebPasswordCredential(
input->id.To<base::string16>(), input->password.To<base::string16>(),
- input->name.To<base::string16>(), input->icon.To<GURL>()));
+ input->name.To<base::string16>(), input->icon));
break;
case mojom::CredentialType::FEDERATED:
output.reset(new blink::WebFederatedCredential(
input->id.To<base::string16>(), input->federation,
- input->name.To<base::string16>(), input->icon.To<GURL>()));
+ input->name.To<base::string16>(), input->icon));
break;
case mojom::CredentialType::EMPTY:
// Intentionally empty, return nullptr.

Powered by Google App Engine
This is Rietveld 408576698