content/shell/android/shell_library_loader.cc - Issue 11647013: Enable Tracing on content shell for Android

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: content/shell/android/shell_library_loader.cc

Issue 11647013: Enable Tracing on content shell for Android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Add license header, javadoc comment and some minor fix Created 8 years ago

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

Jump to:

Index: content/shell/android/shell_library_loader.cc

diff --git a/content/shell/android/shell_library_loader.cc b/content/shell/android/shell_library_loader.cc

index 88262c925a0ca93c694b28e8b47a112b7cb86f6e..fcace0b80dc66b640db5fcdef495c9af3d767bf6 100644

--- a/content/shell/android/shell_library_loader.cc

+++ b/content/shell/android/shell_library_loader.cc

@@ -11,12 +11,14 @@

#include "content/public/app/content_main.h"

#include "content/public/browser/android/compositor.h"

#include "content/shell/android/shell_manager.h"

+#include "content/shell/android/tracing_shell.h"

#include "content/shell/shell.h"

#include "content/shell/shell_main_delegate.h"

static base::android::RegistrationMethod kRegistrationMethods[] = {

{ "Shell", content::Shell::Register },

{ "ShellManager", content::RegisterShellManager },

+ { "TraceController", content::RegisterTracingHandler },

};

// This is called by the VM when the shared library is first loaded.