views/controls/textfield/native_textfield_views.h - Issue 8294026: Support IMM32 reconversion on Windows

Side by Side Diff: views/controls/textfield/native_textfield_views.h

Issue 8294026: Support IMM32 reconversion on Windows (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Fix return values Created 9 years, 1 month 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

« content/browser/renderer_host/render_widget_host_view.cc ('K') | « content/renderer/render_widget.cc ('k') | views/controls/textfield/native_textfield_views.cc » ('j') | views/ime/input_method_win.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_	5 #ifndef VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_

6 #define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_	6 #define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_

7 #pragma once	7 #pragma once

8	8

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "base/string16.h"	10 #include "base/string16.h"

(...skipping 140 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
151 virtual void InsertText(const string16& text) OVERRIDE;	151 virtual void InsertText(const string16& text) OVERRIDE;

152 virtual void InsertChar(char16 ch, int flags) OVERRIDE;	152 virtual void InsertChar(char16 ch, int flags) OVERRIDE;

153 virtual ui::TextInputType GetTextInputType() const OVERRIDE;	153 virtual ui::TextInputType GetTextInputType() const OVERRIDE;

154 virtual gfx::Rect GetCaretBounds() OVERRIDE;	154 virtual gfx::Rect GetCaretBounds() OVERRIDE;

155 virtual bool HasCompositionText() OVERRIDE;	155 virtual bool HasCompositionText() OVERRIDE;

156 virtual bool GetTextRange(ui::Range* range) OVERRIDE;	156 virtual bool GetTextRange(ui::Range* range) OVERRIDE;

157 virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE;	157 virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE;

158 virtual bool GetSelectionRange(ui::Range* range) OVERRIDE;	158 virtual bool GetSelectionRange(ui::Range* range) OVERRIDE;

159 virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE;	159 virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE;

160 virtual bool DeleteRange(const ui::Range& range) OVERRIDE;	160 virtual bool DeleteRange(const ui::Range& range) OVERRIDE;

161 virtual bool GetTextFromRange(	161 virtual bool GetTextFromRange(const ui::Range& range,

162 const ui::Range& range,	162 string16* text) OVERRIDE;

163 const base::Callback<void(const string16&)>& callback) OVERRIDE;

164 virtual void OnInputMethodChanged() OVERRIDE;	163 virtual void OnInputMethodChanged() OVERRIDE;

165 virtual bool ChangeTextDirectionAndLayoutAlignment(	164 virtual bool ChangeTextDirectionAndLayoutAlignment(

166 base::i18n::TextDirection direction) OVERRIDE;	165 base::i18n::TextDirection direction) OVERRIDE;

167 virtual View* GetOwnerViewOfTextInputClient() OVERRIDE;	166 virtual View* GetOwnerViewOfTextInputClient() OVERRIDE;

168	167

169 // Overridden from TextfieldViewsModel::Delegate:	168 // Overridden from TextfieldViewsModel::Delegate:

170 virtual void OnCompositionTextConfirmedOrCleared() OVERRIDE;	169 virtual void OnCompositionTextConfirmedOrCleared() OVERRIDE;

171	170

172 // Returns the TextfieldViewsModel's text/cursor/selection rendering model.	171 // Returns the TextfieldViewsModel's text/cursor/selection rendering model.

173 gfx::RenderText* GetRenderText() const;	172 gfx::RenderText* GetRenderText() const;

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
254 scoped_ptr<views::MenuRunner> context_menu_runner_;	253 scoped_ptr<views::MenuRunner> context_menu_runner_;

255	254

256 scoped_ptr<TouchSelectionController> touch_selection_controller_;	255 scoped_ptr<TouchSelectionController> touch_selection_controller_;

257	256

258 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);	257 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);

259 };	258 };

260	259

261 } // namespace views	260 } // namespace views

262	261

263 #endif // VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_	262 #endif // VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_

OLD	NEW