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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_guest.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect, 143 virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect,
144 const SkBitmap& zoomed_bitmap) OVERRIDE; 144 const SkBitmap& zoomed_bitmap) OVERRIDE;
145 virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE; 145 virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE;
146 #endif // defined(OS_ANDROID) 146 #endif // defined(OS_ANDROID)
147 147
148 #if defined(TOOLKIT_GTK) 148 #if defined(TOOLKIT_GTK)
149 virtual GdkEventButton* GetLastMouseDown() OVERRIDE; 149 virtual GdkEventButton* GetLastMouseDown() OVERRIDE;
150 virtual gfx::NativeView BuildInputMethodsGtkMenu() OVERRIDE; 150 virtual gfx::NativeView BuildInputMethodsGtkMenu() OVERRIDE;
151 #endif // defined(TOOLKIT_GTK) 151 #endif // defined(TOOLKIT_GTK)
152 152
153 #if defined(OS_WIN) && !defined(USE_AURA) 153 #if defined(OS_WIN)
154 virtual void WillWmDestroy() OVERRIDE;
155 #endif // defined(OS_WIN) && !defined(USE_AURA)
156
157 #if defined(OS_WIN) && defined(USE_AURA)
158 virtual void SetParentNativeViewAccessible( 154 virtual void SetParentNativeViewAccessible(
159 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 155 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
160 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; 156 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
161 #endif 157 #endif
162 158
163 // Overridden from ui::GestureEventHelper. 159 // Overridden from ui::GestureEventHelper.
164 virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE; 160 virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE;
165 virtual void DispatchPostponedGestureEvent(ui::GestureEvent* event) OVERRIDE; 161 virtual void DispatchPostponedGestureEvent(ui::GestureEvent* event) OVERRIDE;
166 virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE; 162 virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
167 163
(...skipping 18 matching lines...) Expand all
186 RenderWidgetHostViewPort* platform_view_; 182 RenderWidgetHostViewPort* platform_view_;
187 #if defined(OS_WIN) || defined(USE_AURA) 183 #if defined(OS_WIN) || defined(USE_AURA)
188 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; 184 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_;
189 #endif // defined(OS_WIN) || defined(USE_AURA) 185 #endif // defined(OS_WIN) || defined(USE_AURA)
190 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest); 186 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest);
191 }; 187 };
192 188
193 } // namespace content 189 } // namespace content
194 190
195 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ 191 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698