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

Unified Diff: chrome/renderer/content_settings_observer.cc

Issue 2651543007: Use explicit WebString conversions in remaining chrome/renderer files (Closed)
Patch Set: 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
Index: chrome/renderer/content_settings_observer.cc
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index a956b85f64fa1e35001d3b92f88c71096e41a3f2..3a696956517d71405d91a2af216ebeda22e939fe 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -216,8 +216,8 @@ bool ContentSettingsObserver::allowDatabase(const WebString& name,
bool result = false;
Send(new ChromeViewHostMsg_AllowDatabase(
routing_id(), url::Origin(frame->getSecurityOrigin()).GetURL(),
- url::Origin(frame->top()->getSecurityOrigin()).GetURL(), name,
- display_name, &result));
+ url::Origin(frame->top()->getSecurityOrigin()).GetURL(), name.utf16(),
+ display_name.utf16(), &result));
return result;
}
@@ -275,7 +275,8 @@ bool ContentSettingsObserver::allowIndexedDB(const WebString& name,
bool result = false;
Send(new ChromeViewHostMsg_AllowIndexedDB(
routing_id(), url::Origin(frame->getSecurityOrigin()).GetURL(),
- url::Origin(frame->top()->getSecurityOrigin()).GetURL(), name, &result));
+ url::Origin(frame->top()->getSecurityOrigin()).GetURL(), name.utf16(),
+ &result));
return result;
}
@@ -481,8 +482,7 @@ bool ContentSettingsObserver::IsPlatformApp() {
#if BUILDFLAG(ENABLE_EXTENSIONS)
const extensions::Extension* ContentSettingsObserver::GetExtension(
const WebSecurityOrigin& origin) const {
- if (!base::EqualsASCII(base::StringPiece16(origin.protocol()),
- extensions::kExtensionScheme))
+ if (origin.protocol().ascii() != extensions::kExtensionScheme)
return NULL;
const std::string extension_id = origin.host().utf8().data();
« no previous file with comments | « chrome/renderer/chrome_render_thread_observer.cc ('k') | chrome/renderer/extensions/page_capture_custom_bindings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698