diff options
Diffstat (limited to 'content/renderer')
-rw-r--r-- | content/renderer/dom_serializer_browsertest.cc | 2 | ||||
-rw-r--r-- | content/renderer/fetchers/resource_fetcher_impl.cc | 2 | ||||
-rw-r--r-- | content/renderer/manifest/manifest_parser.cc | 28 | ||||
-rw-r--r-- | content/renderer/media/user_media_client_impl.cc | 2 | ||||
-rw-r--r-- | content/renderer/npapi/webplugin_impl.cc | 2 | ||||
-rw-r--r-- | content/renderer/render_frame_impl.cc | 2 | ||||
-rw-r--r-- | content/renderer/render_view_impl.cc | 4 | ||||
-rw-r--r-- | content/renderer/savable_resources.cc | 2 |
8 files changed, 24 insertions, 20 deletions
diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index cd99e27..c72df6f 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -108,7 +108,7 @@ bool IsMetaElement(const WebNode& node, std::string& charset_info) { charset_info.erase(0, charset_info.length()); // Check the META charset declaration. WebString httpEquiv = meta.getAttribute("http-equiv"); - if (LowerCaseEqualsASCII(httpEquiv, "content-type")) { + if (base::LowerCaseEqualsASCII(httpEquiv, "content-type")) { std::string content = meta.getAttribute("content").utf8(); int pos = content.find("charset", 0); if (pos > -1) { diff --git a/content/renderer/fetchers/resource_fetcher_impl.cc b/content/renderer/fetchers/resource_fetcher_impl.cc index e296937..b48ad21 100644 --- a/content/renderer/fetchers/resource_fetcher_impl.cc +++ b/content/renderer/fetchers/resource_fetcher_impl.cc @@ -56,7 +56,7 @@ void ResourceFetcherImpl::SetHeader(const std::string& header, DCHECK(!request_.isNull()); DCHECK(!loader_); - if (LowerCaseEqualsASCII(header, "referer")) { + if (base::LowerCaseEqualsASCII(header, "referer")) { blink::WebString referrer = blink::WebSecurityPolicy::generateReferrerHeader( blink::WebReferrerPolicyDefault, diff --git a/content/renderer/manifest/manifest_parser.cc b/content/renderer/manifest/manifest_parser.cc index 02a5c9c..7e2fc77 100644 --- a/content/renderer/manifest/manifest_parser.cc +++ b/content/renderer/manifest/manifest_parser.cc @@ -221,13 +221,13 @@ Manifest::DisplayMode ManifestParser::ParseDisplay( if (display.is_null()) return Manifest::DISPLAY_MODE_UNSPECIFIED; - if (LowerCaseEqualsASCII(display.string(), "fullscreen")) + if (base::LowerCaseEqualsASCII(display.string(), "fullscreen")) return Manifest::DISPLAY_MODE_FULLSCREEN; - else if (LowerCaseEqualsASCII(display.string(), "standalone")) + else if (base::LowerCaseEqualsASCII(display.string(), "standalone")) return Manifest::DISPLAY_MODE_STANDALONE; - else if (LowerCaseEqualsASCII(display.string(), "minimal-ui")) + else if (base::LowerCaseEqualsASCII(display.string(), "minimal-ui")) return Manifest::DISPLAY_MODE_MINIMAL_UI; - else if (LowerCaseEqualsASCII(display.string(), "browser")) + else if (base::LowerCaseEqualsASCII(display.string(), "browser")) return Manifest::DISPLAY_MODE_BROWSER; else { errors_.push_back(GetErrorPrefix() + "unknown 'display' value ignored."); @@ -243,21 +243,25 @@ blink::WebScreenOrientationLockType ManifestParser::ParseOrientation( if (orientation.is_null()) return blink::WebScreenOrientationLockDefault; - if (LowerCaseEqualsASCII(orientation.string(), "any")) + if (base::LowerCaseEqualsASCII(orientation.string(), "any")) return blink::WebScreenOrientationLockAny; - else if (LowerCaseEqualsASCII(orientation.string(), "natural")) + else if (base::LowerCaseEqualsASCII(orientation.string(), "natural")) return blink::WebScreenOrientationLockNatural; - else if (LowerCaseEqualsASCII(orientation.string(), "landscape")) + else if (base::LowerCaseEqualsASCII(orientation.string(), "landscape")) return blink::WebScreenOrientationLockLandscape; - else if (LowerCaseEqualsASCII(orientation.string(), "landscape-primary")) + else if (base::LowerCaseEqualsASCII(orientation.string(), + "landscape-primary")) return blink::WebScreenOrientationLockLandscapePrimary; - else if (LowerCaseEqualsASCII(orientation.string(), "landscape-secondary")) + else if (base::LowerCaseEqualsASCII(orientation.string(), + "landscape-secondary")) return blink::WebScreenOrientationLockLandscapeSecondary; - else if (LowerCaseEqualsASCII(orientation.string(), "portrait")) + else if (base::LowerCaseEqualsASCII(orientation.string(), "portrait")) return blink::WebScreenOrientationLockPortrait; - else if (LowerCaseEqualsASCII(orientation.string(), "portrait-primary")) + else if (base::LowerCaseEqualsASCII(orientation.string(), + "portrait-primary")) return blink::WebScreenOrientationLockPortraitPrimary; - else if (LowerCaseEqualsASCII(orientation.string(), "portrait-secondary")) + else if (base::LowerCaseEqualsASCII(orientation.string(), + "portrait-secondary")) return blink::WebScreenOrientationLockPortraitSecondary; else { errors_.push_back(GetErrorPrefix() + diff --git a/content/renderer/media/user_media_client_impl.cc b/content/renderer/media/user_media_client_impl.cc index e09ccb6..22ec3d1 100644 --- a/content/renderer/media/user_media_client_impl.cc +++ b/content/renderer/media/user_media_client_impl.cc @@ -160,7 +160,7 @@ void UserMediaClientImpl::requestUserMedia( std::string enable; if (options.GetFirstAudioConstraintByName( kMediaStreamRenderToAssociatedSink, &enable, NULL) && - LowerCaseEqualsASCII(enable, "true")) { + base::LowerCaseEqualsASCII(enable, "true")) { enable_automatic_output_device_selection = true; } } diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc index 127c574..046d33c 100644 --- a/content/renderer/npapi/webplugin_impl.cc +++ b/content/renderer/npapi/webplugin_impl.cc @@ -942,7 +942,7 @@ void WebPluginImpl::willSendRequest(WebURLLoader* loader, // just block cross origin 307 POST redirects. if (!client_info->notify_redirects) { if (response.httpStatusCode() == 307 && - LowerCaseEqualsASCII(request.httpMethod().utf8(), "post")) { + base::LowerCaseEqualsASCII(request.httpMethod().utf8(), "post")) { GURL original_request_url(response.url()); GURL response_url(request.url()); if (original_request_url.GetOrigin() != response_url.GetOrigin()) { diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index e37dcde..5197c66 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -3247,7 +3247,7 @@ void RenderFrameImpl::willSendRequest( navigation_state->start_params().extra_headers.begin(), navigation_state->start_params().extra_headers.end(), "\n"); i.GetNext();) { - if (LowerCaseEqualsASCII(i.name(), "referer")) { + if (base::LowerCaseEqualsASCII(i.name(), "referer")) { WebString referrer = WebSecurityPolicy::generateReferrerHeader( blink::WebReferrerPolicyDefault, request.url(), diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 1c4f809..9ab74b3 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -2219,8 +2219,8 @@ bool RenderViewImpl::IsEditableNode(const WebNode& node) const { // Also return true if it has an ARIA role of 'textbox'. for (unsigned i = 0; i < element.attributeCount(); ++i) { - if (LowerCaseEqualsASCII(element.attributeLocalName(i), "role")) { - if (LowerCaseEqualsASCII(element.attributeValue(i), "textbox")) + if (base::LowerCaseEqualsASCII(element.attributeLocalName(i), "role")) { + if (base::LowerCaseEqualsASCII(element.attributeValue(i), "textbox")) return true; break; } diff --git a/content/renderer/savable_resources.cc b/content/renderer/savable_resources.cc index 958003f..363cb59 100644 --- a/content/renderer/savable_resources.cc +++ b/content/renderer/savable_resources.cc @@ -166,7 +166,7 @@ WebString GetSubResourceLinkFromElement(const WebElement& element) { attribute_name = "cite"; } else if (element.hasHTMLTagName("link")) { // If the link element is not linked to css, ignore it. - if (LowerCaseEqualsASCII(element.getAttribute("type"), "text/css")) { + if (base::LowerCaseEqualsASCII(element.getAttribute("type"), "text/css")) { // TODO(jnd): Add support for extracting links of sub-resources which // are inside style-sheet such as @import, url(), etc. // See bug: http://b/issue?id=1111667. |