Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1048)

Unified Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

Issue 137403005: Remove some code inside USE_AURA and OS_WIN ifdefs. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 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:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_widget_host_view_child_frame.h
===================================================================
--- content/browser/frame_host/render_widget_host_view_child_frame.h (revision 244508)
+++ content/browser/frame_host/render_widget_host_view_child_frame.h (working copy)
@@ -52,9 +52,6 @@
virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
virtual void SetBackground(const SkBitmap& background) OVERRIDE;
virtual gfx::Size GetPhysicalBackingSize() const OVERRIDE;
-#if defined(OS_WIN) && !defined(USE_AURA)
- virtual void SetClickthroughRegion(SkRegion* region) OVERRIDE;
-#endif
// RenderWidgetHostViewPort implementation.
virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
@@ -163,11 +160,7 @@
virtual gfx::NativeView BuildInputMethodsGtkMenu() OVERRIDE;
#endif // defined(TOOLKIT_GTK)
-#if defined(OS_WIN) && !defined(USE_AURA)
- virtual void WillWmDestroy() OVERRIDE;
-#endif // defined(OS_WIN) && !defined(USE_AURA)
-
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
virtual void SetParentNativeViewAccessible(
gfx::NativeViewAccessible accessible_parent) OVERRIDE;
virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698