chrome/browser/renderer_host/render_widget_host_view_views.h - Issue 7850026: Aura under Linux

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/renderer_host/render_widget_host_view_views.h

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Still a few linking errors to resolve. Created 9 years, 3 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/renderer_host/render_widget_host_view_views.h

diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.h b/chrome/browser/renderer_host/render_widget_host_view_views.h

index e81b48d11b4ae093c5cdd59eb369ab504ccf5b5d..b88d496180e660eb6eb3f46ce0e0796b958415d6 100644

--- a/chrome/browser/renderer_host/render_widget_host_view_views.h

+++ b/chrome/browser/renderer_host/render_widget_host_view_views.h

@@ -91,7 +91,7 @@ class RenderWidgetHostViewViews : public RenderWidgetHostView,

virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;

virtual gfx::Rect GetRootWindowBounds() OVERRIDE;

#endif

-#if defined(TOOLKIT_USES_GTK)

+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)

virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE;

virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE;

#endif

@@ -103,7 +103,7 @@ class RenderWidgetHostViewViews : public RenderWidgetHostView,

bool has_horizontal_scrollbar) OVERRIDE;

virtual void SetScrollOffsetPinning(

bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;

-#if defined(TOOLKIT_USES_GTK)

+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)

virtual void AcceleratedCompositingActivated(bool activated) OVERRIDE;

#endif

#if defined(OS_WIN)