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

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

Issue 610893003: Remove #ifdefs around ShowLinkDisambiguationPopup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix my awful spelling Created 6 years, 2 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
« no previous file with comments | « no previous file | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) || defined(TOOLKIT_VIEWS) || defined(USE_AURA)
141 // RenderWidgetHostViewBase implementation. 140 // RenderWidgetHostViewBase implementation.
142 virtual void ShowDisambiguationPopup(
143 const gfx::Rect& rect_pixels,
144 const SkBitmap& zoomed_bitmap) OVERRIDE;
145 #endif // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
146
147 #if defined(OS_ANDROID) 141 #if defined(OS_ANDROID)
148 virtual void LockCompositingSurface() OVERRIDE; 142 virtual void LockCompositingSurface() OVERRIDE;
149 virtual void UnlockCompositingSurface() OVERRIDE; 143 virtual void UnlockCompositingSurface() OVERRIDE;
150 #endif // defined(OS_ANDROID) 144 #endif // defined(OS_ANDROID)
151 145
152 #if defined(OS_WIN) 146 #if defined(OS_WIN)
153 virtual void SetParentNativeViewAccessible( 147 virtual void SetParentNativeViewAccessible(
154 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 148 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
155 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; 149 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
156 #endif 150 #endif
(...skipping 16 matching lines...) Expand all
173 // sent through it are routed to the embedding renderer process. 167 // sent through it are routed to the embedding renderer process.
174 CrossProcessFrameConnector* frame_connector_; 168 CrossProcessFrameConnector* frame_connector_;
175 169
176 private: 170 private:
177 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 171 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
178 }; 172 };
179 173
180 } // namespace content 174 } // namespace content
181 175
182 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 176 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698