chrome/browser/extensions/extension_host.h - Issue 9433044: Fix extensions compile issues for Android on sync_unit_tests.

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/extensions/extension_host.h

Issue 9433044: Fix extensions compile issues for Android on sync_unit_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 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:

Index: chrome/browser/extensions/extension_host.h

diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h

index 044e15d8858f085c84969d39570eb3f88bbb241b..2a5d1d3406fa3d0d55b8626f9306fbad1ae283a3 100644

--- a/chrome/browser/extensions/extension_host.h

+++ b/chrome/browser/extensions/extension_host.h

@@ -26,6 +26,8 @@

#include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"

#elif defined(TOOLKIT_GTK)

#include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h"

+#elif defined(OS_ANDROID)

+#include "chrome/browser/ui/android/extensions/extension_view_android.h"

#endif

class Browser;

@@ -58,7 +60,7 @@ class ExtensionHost : public content::WebContentsDelegate,

typedef ExtensionViewGtk PlatformExtensionView;

#elif defined(OS_ANDROID)

// Android does not support extensions.

- typedef void* PlatformExtensionView;

+ typedef ExtensionViewAndroid PlatformExtensionView;

#endif

ExtensionHost(const Extension* extension,