chrome/browser/ui/webui/tracing_ui.cc - Issue 12194007: Revert 180055: Very likely caused http://crbug.com/173885

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/webui/tracing_ui.cc

Issue 12194007: Revert 180055: Very likely caused http://crbug.com/173885 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/tracing_ui.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/webui/tracing_ui.h"	5 #include "chrome/browser/ui/webui/tracing_ui.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/bind_helpers.h"	10 #include "base/bind_helpers.h"

(...skipping 489 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
500 //	500 //

501 ////////////////////////////////////////////////////////////////////////////////	501 ////////////////////////////////////////////////////////////////////////////////

502	502

503 TracingUI::TracingUI(content::WebUI* web_ui) : WebUIController(web_ui) {	503 TracingUI::TracingUI(content::WebUI* web_ui) : WebUIController(web_ui) {

504 web_ui->AddMessageHandler(new TracingMessageHandler());	504 web_ui->AddMessageHandler(new TracingMessageHandler());

505	505

506 // Set up the chrome://tracing/ source.	506 // Set up the chrome://tracing/ source.

507 Profile* profile = Profile::FromWebUI(web_ui);	507 Profile* profile = Profile::FromWebUI(web_ui);

508 content::WebUIDataSource::Add(profile, CreateTracingHTMLSource());	508 content::WebUIDataSource::Add(profile, CreateTracingHTMLSource());

509 }	509 }

OLD	NEW