components/dom_distiller/content/browser/dom_distiller_viewer_source.cc - Issue 2779893005: Continue to clean c_str() calls.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/dom_distiller/content/browser/dom_distiller_viewer_source.cc

Issue 2779893005: Continue to clean c_str() calls. (Closed)

Patch Set: Revert changes in font_service_app.cc Created 3 years, 9 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 | « components/content_settings/core/browser/host_content_settings_map.cc ('k') | components/nacl/zygote/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/dom_distiller/content/browser/dom_distiller_viewer_source.cc

diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc

index 061bf0cc2fda7c07049100bc5a0f3a1555228583..c9273e10fc0d6c0300c9c91bb85c30f60a6f8926 100644

--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc

+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc

@@ -136,7 +136,7 @@ void DomDistillerViewerSource::RequestViewerHandle::DidFinishNavigation(

const GURL& navigation = navigation_handle->GetURL();

bool expected_main_view_request =

- navigation.SchemeIs(expected_scheme_.c_str()) &&

+ navigation.SchemeIs(expected_scheme_) &&

expected_request_path_ == navigation.query();

if (navigation_handle->IsSameDocument() || expected_main_view_request) {

// In-page navigations, as well as the main view request can be ignored.

@@ -291,7 +291,7 @@ std::string DomDistillerViewerSource::GetMimeType(

bool DomDistillerViewerSource::ShouldServiceRequest(

const net::URLRequest* request) const {

- return request->url().SchemeIs(scheme_.c_str());

+ return request->url().SchemeIs(scheme_);

}

// TODO(nyquist): Start tracking requests using this method.