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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 const gfx::Range& range, 185 const gfx::Range& range,
186 const std::vector<gfx::Rect>& character_bounds) OVERRIDE; 186 const std::vector<gfx::Rect>& character_bounds) OVERRIDE;
187 virtual void DidUpdateBackingStore( 187 virtual void DidUpdateBackingStore(
188 const gfx::Rect& scroll_rect, 188 const gfx::Rect& scroll_rect,
189 const gfx::Vector2d& scroll_delta, 189 const gfx::Vector2d& scroll_delta,
190 const std::vector<gfx::Rect>& copy_rects, 190 const std::vector<gfx::Rect>& copy_rects,
191 const ui::LatencyInfo& latency_info) OVERRIDE; 191 const ui::LatencyInfo& latency_info) OVERRIDE;
192 virtual void RenderProcessGone(base::TerminationStatus status, 192 virtual void RenderProcessGone(base::TerminationStatus status,
193 int error_code) OVERRIDE; 193 int error_code) OVERRIDE;
194 virtual void Destroy() OVERRIDE; 194 virtual void Destroy() OVERRIDE;
195 virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE; 195 virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE;
196 virtual void SelectionChanged(const string16& text, 196 virtual void SelectionChanged(const base::string16& text,
197 size_t offset, 197 size_t offset,
198 const gfx::Range& range) OVERRIDE; 198 const gfx::Range& range) OVERRIDE;
199 virtual void SelectionBoundsChanged( 199 virtual void SelectionBoundsChanged(
200 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE; 200 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
201 virtual void ScrollOffsetChanged() OVERRIDE; 201 virtual void ScrollOffsetChanged() OVERRIDE;
202 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE; 202 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;
203 virtual void CopyFromCompositingSurface( 203 virtual void CopyFromCompositingSurface(
204 const gfx::Rect& src_subrect, 204 const gfx::Rect& src_subrect,
205 const gfx::Size& dst_size, 205 const gfx::Size& dst_size,
206 const base::Callback<void(bool, const SkBitmap&)>& callback) OVERRIDE; 206 const base::Callback<void(bool, const SkBitmap&)>& callback) OVERRIDE;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 virtual void SetParentNativeViewAccessible( 251 virtual void SetParentNativeViewAccessible(
252 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 252 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
253 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; 253 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
254 #endif 254 #endif
255 255
256 // Overridden from ui::TextInputClient: 256 // Overridden from ui::TextInputClient:
257 virtual void SetCompositionText( 257 virtual void SetCompositionText(
258 const ui::CompositionText& composition) OVERRIDE; 258 const ui::CompositionText& composition) OVERRIDE;
259 virtual void ConfirmCompositionText() OVERRIDE; 259 virtual void ConfirmCompositionText() OVERRIDE;
260 virtual void ClearCompositionText() OVERRIDE; 260 virtual void ClearCompositionText() OVERRIDE;
261 virtual void InsertText(const string16& text) OVERRIDE; 261 virtual void InsertText(const base::string16& text) OVERRIDE;
262 virtual void InsertChar(char16 ch, int flags) OVERRIDE; 262 virtual void InsertChar(char16 ch, int flags) OVERRIDE;
263 virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE; 263 virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE;
264 virtual ui::TextInputType GetTextInputType() const OVERRIDE; 264 virtual ui::TextInputType GetTextInputType() const OVERRIDE;
265 virtual ui::TextInputMode GetTextInputMode() const OVERRIDE; 265 virtual ui::TextInputMode GetTextInputMode() const OVERRIDE;
266 virtual bool CanComposeInline() const OVERRIDE; 266 virtual bool CanComposeInline() const OVERRIDE;
267 virtual gfx::Rect GetCaretBounds() const OVERRIDE; 267 virtual gfx::Rect GetCaretBounds() const OVERRIDE;
268 virtual bool GetCompositionCharacterBounds(uint32 index, 268 virtual bool GetCompositionCharacterBounds(uint32 index,
269 gfx::Rect* rect) const OVERRIDE; 269 gfx::Rect* rect) const OVERRIDE;
270 virtual bool HasCompositionText() const OVERRIDE; 270 virtual bool HasCompositionText() const OVERRIDE;
271 virtual bool GetTextRange(gfx::Range* range) const OVERRIDE; 271 virtual bool GetTextRange(gfx::Range* range) const OVERRIDE;
272 virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE; 272 virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE;
273 virtual bool GetSelectionRange(gfx::Range* range) const OVERRIDE; 273 virtual bool GetSelectionRange(gfx::Range* range) const OVERRIDE;
274 virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE; 274 virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE;
275 virtual bool DeleteRange(const gfx::Range& range) OVERRIDE; 275 virtual bool DeleteRange(const gfx::Range& range) OVERRIDE;
276 virtual bool GetTextFromRange(const gfx::Range& range, 276 virtual bool GetTextFromRange(const gfx::Range& range,
277 string16* text) const OVERRIDE; 277 base::string16* text) const OVERRIDE;
278 virtual void OnInputMethodChanged() OVERRIDE; 278 virtual void OnInputMethodChanged() OVERRIDE;
279 virtual bool ChangeTextDirectionAndLayoutAlignment( 279 virtual bool ChangeTextDirectionAndLayoutAlignment(
280 base::i18n::TextDirection direction) OVERRIDE; 280 base::i18n::TextDirection direction) OVERRIDE;
281 virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE; 281 virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE;
282 virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE; 282 virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE;
283 virtual void OnCandidateWindowShown() OVERRIDE; 283 virtual void OnCandidateWindowShown() OVERRIDE;
284 virtual void OnCandidateWindowUpdated() OVERRIDE; 284 virtual void OnCandidateWindowUpdated() OVERRIDE;
285 virtual void OnCandidateWindowHidden() OVERRIDE; 285 virtual void OnCandidateWindowHidden() OVERRIDE;
286 286
287 // Overridden from gfx::DisplayObserver: 287 // Overridden from gfx::DisplayObserver:
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 // The current composition character bounds. 612 // The current composition character bounds.
613 std::vector<gfx::Rect> composition_character_bounds_; 613 std::vector<gfx::Rect> composition_character_bounds_;
614 614
615 // Indicates if there is onging composition text. 615 // Indicates if there is onging composition text.
616 bool has_composition_text_; 616 bool has_composition_text_;
617 617
618 // Whether return characters should be passed on to the RenderWidgetHostImpl. 618 // Whether return characters should be passed on to the RenderWidgetHostImpl.
619 bool accept_return_character_; 619 bool accept_return_character_;
620 620
621 // Current tooltip text. 621 // Current tooltip text.
622 string16 tooltip_; 622 base::string16 tooltip_;
623 623
624 std::vector<base::Closure> on_compositing_did_commit_callbacks_; 624 std::vector<base::Closure> on_compositing_did_commit_callbacks_;
625 625
626 // The current frontbuffer texture. 626 // The current frontbuffer texture.
627 scoped_refptr<ui::Texture> current_surface_; 627 scoped_refptr<ui::Texture> current_surface_;
628 628
629 // This holds the current software framebuffer, if any. 629 // This holds the current software framebuffer, if any.
630 scoped_ptr<SoftwareFrameManager> software_frame_manager_; 630 scoped_ptr<SoftwareFrameManager> software_frame_manager_;
631 631
632 // With delegated renderer, this is the last output surface, used to 632 // With delegated renderer, this is the last output surface, used to
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 // passed to windowless plugins like Flash/Silverlight, etc as the 772 // passed to windowless plugins like Flash/Silverlight, etc as the
773 // container window. 773 // container window.
774 HWND plugin_parent_window_; 774 HWND plugin_parent_window_;
775 #endif 775 #endif
776 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 776 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
777 }; 777 };
778 778
779 } // namespace content 779 } // namespace content
780 780
781 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 781 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698