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

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

Issue 113403006: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 (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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 253 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
254 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; 254 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
255 #endif 255 #endif
256 256
257 // Overridden from ui::TextInputClient: 257 // Overridden from ui::TextInputClient:
258 virtual void SetCompositionText( 258 virtual void SetCompositionText(
259 const ui::CompositionText& composition) OVERRIDE; 259 const ui::CompositionText& composition) OVERRIDE;
260 virtual void ConfirmCompositionText() OVERRIDE; 260 virtual void ConfirmCompositionText() OVERRIDE;
261 virtual void ClearCompositionText() OVERRIDE; 261 virtual void ClearCompositionText() OVERRIDE;
262 virtual void InsertText(const base::string16& text) OVERRIDE; 262 virtual void InsertText(const base::string16& text) OVERRIDE;
263 virtual void InsertChar(char16 ch, int flags) OVERRIDE; 263 virtual void InsertChar(base::char16 ch, int flags) OVERRIDE;
264 virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE; 264 virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE;
265 virtual ui::TextInputType GetTextInputType() const OVERRIDE; 265 virtual ui::TextInputType GetTextInputType() const OVERRIDE;
266 virtual ui::TextInputMode GetTextInputMode() const OVERRIDE; 266 virtual ui::TextInputMode GetTextInputMode() const OVERRIDE;
267 virtual bool CanComposeInline() const OVERRIDE; 267 virtual bool CanComposeInline() const OVERRIDE;
268 virtual gfx::Rect GetCaretBounds() const OVERRIDE; 268 virtual gfx::Rect GetCaretBounds() const OVERRIDE;
269 virtual bool GetCompositionCharacterBounds(uint32 index, 269 virtual bool GetCompositionCharacterBounds(uint32 index,
270 gfx::Rect* rect) const OVERRIDE; 270 gfx::Rect* rect) const OVERRIDE;
271 virtual bool HasCompositionText() const OVERRIDE; 271 virtual bool HasCompositionText() const OVERRIDE;
272 virtual bool GetTextRange(gfx::Range* range) const OVERRIDE; 272 virtual bool GetTextRange(gfx::Range* range) const OVERRIDE;
273 virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE; 273 virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE;
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 // passed to windowless plugins like Flash/Silverlight, etc as the 791 // passed to windowless plugins like Flash/Silverlight, etc as the
792 // container window. 792 // container window.
793 HWND plugin_parent_window_; 793 HWND plugin_parent_window_;
794 #endif 794 #endif
795 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 795 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
796 }; 796 };
797 797
798 } // namespace content 798 } // namespace content
799 799
800 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 800 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698