chrome/renderer/pepper/pepper_uma_host.cc - Issue 831813004: Get nacl building again 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: chrome/renderer/pepper/pepper_uma_host.cc

Issue 831813004: Get nacl building again for android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Comment out CheckEnvVar Created 5 years, 11 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:

Index: chrome/renderer/pepper/pepper_uma_host.cc

diff --git a/chrome/renderer/pepper/pepper_uma_host.cc b/chrome/renderer/pepper/pepper_uma_host.cc

index 9e32d61dc9fc6a55b9289551295bf08ddf2c2549..dc580e3ecd0010ed5c860e2e51cce8184243bcb1 100644

--- a/chrome/renderer/pepper/pepper_uma_host.cc

+++ b/chrome/renderer/pepper/pepper_uma_host.cc

@@ -13,8 +13,6 @@

#include "content/public/renderer/pepper_plugin_instance.h"

#include "content/public/renderer/render_thread.h"

#include "content/public/renderer/renderer_ppapi_host.h"

-#include "extensions/common/constants.h"

-#include "extensions/common/extension.h"

#include "ppapi/c/pp_errors.h"

#include "ppapi/host/dispatch_host_message.h"

#include "ppapi/host/host_message_context.h"

@@ -23,6 +21,11 @@

#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.

+#if defined(ENABLE_EXTENSIONS)

+#include "extensions/common/constants.h"

+#include "extensions/common/extension.h"

+#endif // defined(ENABLE_EXTENSIONS)

namespace {

const char* const kPredefinedAllowedUMAOrigins[] = {

« no previous file with comments | « chrome/common/BUILD.gn ('k') | components/nacl/browser/nacl_browser.cc » ('j') | no next file with comments »