content/public/browser/browser_context.h - Issue 9271028: android build: progress on content and libjingle.

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/public/browser/browser_context.h

Issue 9271028: android build: progress on content and libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: simplify conditional to make work on non-Android Created 8 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: content/public/browser/browser_context.h

diff --git a/content/public/browser/browser_context.h b/content/public/browser/browser_context.h

index 30e46b14e4649e45b1c282ffbac4b928d4839c91..8b8aadab30101cd36ba16a699e0a21d12bc8124c 100644

--- a/content/public/browser/browser_context.h

+++ b/content/public/browser/browser_context.h

@@ -106,8 +106,8 @@ class BrowserContext {

} // namespace content

-#if defined(COMPILER_GCC) && !defined(OS_ANDROID)

-namespace __gnu_cxx {

+#if defined(COMPILER_GCC)

+namespace BASE_HASH_NAMESPACE {

template<>

struct hash<content::BrowserContext*> {

@@ -116,7 +116,7 @@ struct hash<content::BrowserContext*> {

}

};

-} // namespace __gnu_cxx

+} // namespace BASE_HASH_NAMESPACE

#endif

#endif // CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_