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

Side by Side 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 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_CHILD_FRAME_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/renderer_host/render_widget_host_view_base.h" 9 #include "content/browser/renderer_host/render_widget_host_view_base.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 virtual bool IsSurfaceAvailableForCopy() const OVERRIDE; 45 virtual bool IsSurfaceAvailableForCopy() const OVERRIDE;
46 virtual void Show() OVERRIDE; 46 virtual void Show() OVERRIDE;
47 virtual void Hide() OVERRIDE; 47 virtual void Hide() OVERRIDE;
48 virtual bool IsShowing() OVERRIDE; 48 virtual bool IsShowing() OVERRIDE;
49 virtual gfx::Rect GetViewBounds() const OVERRIDE; 49 virtual gfx::Rect GetViewBounds() const OVERRIDE;
50 virtual gfx::NativeView GetNativeView() const OVERRIDE; 50 virtual gfx::NativeView GetNativeView() const OVERRIDE;
51 virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE; 51 virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
52 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; 52 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
53 virtual void SetBackground(const SkBitmap& background) OVERRIDE; 53 virtual void SetBackground(const SkBitmap& background) OVERRIDE;
54 virtual gfx::Size GetPhysicalBackingSize() const OVERRIDE; 54 virtual gfx::Size GetPhysicalBackingSize() const OVERRIDE;
55 #if defined(OS_WIN) && !defined(USE_AURA)
56 virtual void SetClickthroughRegion(SkRegion* region) OVERRIDE;
57 #endif
58 55
59 // RenderWidgetHostViewPort implementation. 56 // RenderWidgetHostViewPort implementation.
60 virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, 57 virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
61 const gfx::Rect& pos) OVERRIDE; 58 const gfx::Rect& pos) OVERRIDE;
62 virtual void InitAsFullscreen( 59 virtual void InitAsFullscreen(
63 RenderWidgetHostView* reference_host_view) OVERRIDE; 60 RenderWidgetHostView* reference_host_view) OVERRIDE;
64 virtual void WasShown() OVERRIDE; 61 virtual void WasShown() OVERRIDE;
65 virtual void WasHidden() OVERRIDE; 62 virtual void WasHidden() OVERRIDE;
66 virtual void MovePluginWindows( 63 virtual void MovePluginWindows(
67 const gfx::Vector2d& scroll_offset, 64 const gfx::Vector2d& scroll_offset,
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 const gfx::Rect& target_rect, 153 const gfx::Rect& target_rect,
157 const SkBitmap& zoomed_bitmap) OVERRIDE; 154 const SkBitmap& zoomed_bitmap) OVERRIDE;
158 virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE; 155 virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE;
159 #endif // defined(OS_ANDROID) 156 #endif // defined(OS_ANDROID)
160 157
161 #if defined(TOOLKIT_GTK) 158 #if defined(TOOLKIT_GTK)
162 virtual GdkEventButton* GetLastMouseDown() OVERRIDE; 159 virtual GdkEventButton* GetLastMouseDown() OVERRIDE;
163 virtual gfx::NativeView BuildInputMethodsGtkMenu() OVERRIDE; 160 virtual gfx::NativeView BuildInputMethodsGtkMenu() OVERRIDE;
164 #endif // defined(TOOLKIT_GTK) 161 #endif // defined(TOOLKIT_GTK)
165 162
166 #if defined(OS_WIN) && !defined(USE_AURA) 163 #if defined(OS_WIN)
167 virtual void WillWmDestroy() OVERRIDE;
168 #endif // defined(OS_WIN) && !defined(USE_AURA)
169
170 #if defined(OS_WIN) && defined(USE_AURA)
171 virtual void SetParentNativeViewAccessible( 164 virtual void SetParentNativeViewAccessible(
172 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 165 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
173 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; 166 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
174 #endif 167 #endif
175 168
176 protected: 169 protected:
177 friend class RenderWidgetHostView; 170 friend class RenderWidgetHostView;
178 171
179 // Members will become private when RenderWidgetHostViewGuest is removed. 172 // Members will become private when RenderWidgetHostViewGuest is removed.
180 // The model object. 173 // The model object.
181 RenderWidgetHostImpl* host_; 174 RenderWidgetHostImpl* host_;
182 175
183 // frame_connector_ provides a platform abstraction. Messages 176 // frame_connector_ provides a platform abstraction. Messages
184 // sent through it are routed to the embedding renderer process. 177 // sent through it are routed to the embedding renderer process.
185 CrossProcessFrameConnector* frame_connector_; 178 CrossProcessFrameConnector* frame_connector_;
186 179
187 gfx::Size size_; 180 gfx::Size size_;
188 181
189 private: 182 private:
190 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 183 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
191 }; 184 };
192 185
193 } // namespace content 186 } // namespace content
194 187
195 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 188 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698