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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

Issue 351683002: Adds link disambiguation popup support to Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed scrolling cruft Created 6 years, 4 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
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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 virtual bool SupportsSpeech() const OVERRIDE; 130 virtual bool SupportsSpeech() const OVERRIDE;
131 virtual void SpeakSelection() OVERRIDE; 131 virtual void SpeakSelection() OVERRIDE;
132 virtual bool IsSpeaking() const OVERRIDE; 132 virtual bool IsSpeaking() const OVERRIDE;
133 virtual void StopSpeaking() OVERRIDE; 133 virtual void StopSpeaking() OVERRIDE;
134 134
135 // RenderWidgetHostViewBase implementation. 135 // RenderWidgetHostViewBase implementation.
136 virtual bool PostProcessEventForPluginIme( 136 virtual bool PostProcessEventForPluginIme(
137 const NativeWebKeyboardEvent& event) OVERRIDE; 137 const NativeWebKeyboardEvent& event) OVERRIDE;
138 #endif // defined(OS_MACOSX) 138 #endif // defined(OS_MACOSX)
139 139
140 #if defined(OS_ANDROID) 140 #if defined(OS_ANDROID) || defined(OS_WIN)
sky 2014/08/04 20:05:19 OS_WIN->TOOLKIT_VIEWS
luken 2014/09/11 01:07:27 Done.
141 // RenderWidgetHostViewBase implementation. 141 // RenderWidgetHostViewBase implementation.
142 virtual void ShowDisambiguationPopup( 142 virtual void ShowDisambiguationPopup(
143 const gfx::Rect& target_rect, 143 const gfx::Rect& target_rect,
144 const SkBitmap& zoomed_bitmap) OVERRIDE; 144 const SkBitmap& zoomed_bitmap) OVERRIDE;
145 #endif // defined(OS_ANDROID) || defined(OS_WIN)
146
147 #if defined(OS_ANDROID)
145 virtual void LockCompositingSurface() OVERRIDE; 148 virtual void LockCompositingSurface() OVERRIDE;
146 virtual void UnlockCompositingSurface() OVERRIDE; 149 virtual void UnlockCompositingSurface() OVERRIDE;
147 #endif // defined(OS_ANDROID) 150 #endif // defined(OS_ANDROID)
148 151
149 #if defined(OS_WIN) 152 #if defined(OS_WIN)
150 virtual void SetParentNativeViewAccessible( 153 virtual void SetParentNativeViewAccessible(
151 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 154 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
152 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; 155 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
153 #endif 156 #endif
154 157
(...skipping 10 matching lines...) Expand all
165 // sent through it are routed to the embedding renderer process. 168 // sent through it are routed to the embedding renderer process.
166 CrossProcessFrameConnector* frame_connector_; 169 CrossProcessFrameConnector* frame_connector_;
167 170
168 private: 171 private:
169 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 172 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
170 }; 173 };
171 174
172 } // namespace content 175 } // namespace content
173 176
174 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 177 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698