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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_guest.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_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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 virtual bool SupportsSpeech() const OVERRIDE; 120 virtual bool SupportsSpeech() const OVERRIDE;
121 virtual void SpeakSelection() OVERRIDE; 121 virtual void SpeakSelection() OVERRIDE;
122 virtual bool IsSpeaking() const OVERRIDE; 122 virtual bool IsSpeaking() const OVERRIDE;
123 virtual void StopSpeaking() OVERRIDE; 123 virtual void StopSpeaking() OVERRIDE;
124 124
125 // RenderWidgetHostViewBase implementation. 125 // RenderWidgetHostViewBase implementation.
126 virtual bool PostProcessEventForPluginIme( 126 virtual bool PostProcessEventForPluginIme(
127 const NativeWebKeyboardEvent& event) OVERRIDE; 127 const NativeWebKeyboardEvent& event) OVERRIDE;
128 #endif // defined(OS_MACOSX) 128 #endif // defined(OS_MACOSX)
129 129
130 #if defined(OS_ANDROID) 130 #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.
131 // RenderWidgetHostViewBase implementation. 131 // RenderWidgetHostViewBase implementation.
132 virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect, 132 virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect,
133 const SkBitmap& zoomed_bitmap) OVERRIDE; 133 const SkBitmap& zoomed_bitmap) OVERRIDE;
134 #endif // defined(OS_ANDROID) || defined(OS_WIN)
135
136 #if defined(OS_ANDROID)
134 virtual void LockCompositingSurface() OVERRIDE; 137 virtual void LockCompositingSurface() OVERRIDE;
135 virtual void UnlockCompositingSurface() OVERRIDE; 138 virtual void UnlockCompositingSurface() OVERRIDE;
136 #endif // defined(OS_ANDROID) 139 #endif // defined(OS_ANDROID)
137 140
138 #if defined(OS_WIN) 141 #if defined(OS_WIN)
139 virtual void SetParentNativeViewAccessible( 142 virtual void SetParentNativeViewAccessible(
140 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 143 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
141 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; 144 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
142 #endif 145 #endif
143 146
(...skipping 29 matching lines...) Expand all
173 RenderWidgetHostViewBase* platform_view_; 176 RenderWidgetHostViewBase* platform_view_;
174 #if defined(USE_AURA) 177 #if defined(USE_AURA)
175 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; 178 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_;
176 #endif 179 #endif
177 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest); 180 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest);
178 }; 181 };
179 182
180 } // namespace content 183 } // namespace content
181 184
182 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ 185 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698