chrome/browser/ui/webui/print_preview/print_preview_data_source.cc - Issue 10873097: Merge 153342 - Print preview: Use an ID instead of memory pointer string in WebUI.

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: chrome/browser/ui/webui/print_preview/print_preview_data_source.cc

Issue 10873097: Merge 153342 - Print preview: Use an ID instead of memory pointer string in WebUI. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1229/src/

Patch Set: Created 8 years, 4 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 | « chrome/browser/ui/webui/print_preview/print_preview_data_source.h ('k') | chrome/browser/ui/webui/print_preview/print_preview_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/print_preview/print_preview_data_source.cc

===================================================================

--- chrome/browser/ui/webui/print_preview/print_preview_data_source.cc (revision 153583)

+++ chrome/browser/ui/webui/print_preview/print_preview_data_source.cc (working copy)

@@ -195,10 +195,14 @@

scoped_refptr<base::RefCountedBytes> data;

std::vector<std::string> url_substr;

base::SplitString(path, '/', &url_substr);

+ int preview_ui_id = -1;

int page_index = 0;

- if (url_substr.size() == 3 && base::StringToInt(url_substr[1], &page_index)) {

+ if (url_substr.size() == 3 &&

+ base::StringToInt(url_substr[0], &preview_ui_id),

+ base::StringToInt(url_substr[1], &page_index) &&

+ preview_ui_id >= 0) {

PrintPreviewDataService::GetInstance()->GetDataEntry(

- url_substr[0], page_index, &data);

+ preview_ui_id, page_index, &data);

}

if (data.get()) {

SendResponse(request_id, data);