trunk/src/ui/views/ime/input_method_bridge_unittest.cc - Issue 23710009: Revert 219673 "Fix Views Combobox and Tree View text input."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: trunk/src/ui/views/ime/input_method_bridge_unittest.cc

Issue 23710009: Revert 219673 "Fix Views Combobox and Tree View text input." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 3 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

« no previous file with comments | « trunk/src/ui/views/ime/input_method_bridge.cc ('k') | trunk/src/ui/views/ime/mock_input_method.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 #include "ui/aura/client/aura_constants.h"	5 #include "ui/aura/client/aura_constants.h"

6 #include "ui/aura/window.h"	6 #include "ui/aura/window.h"

7 #include "ui/base/ime/dummy_input_method.h"	7 #include "ui/base/ime/dummy_input_method.h"

8 #include "ui/base/ime/text_input_client.h"	8 #include "ui/base/ime/text_input_client.h"

9 #include "ui/views/ime/input_method.h"	9 #include "ui/views/ime/input_method.h"

10 #include "ui/views/test/views_test_base.h"	10 #include "ui/views/test/views_test_base.h"

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 toplevel->Init(toplevel_params);	62 toplevel->Init(toplevel_params);

63	63

64 Widget* child = new Widget;	64 Widget* child = new Widget;

65 Widget::InitParams child_params =	65 Widget::InitParams child_params =

66 CreateParams(Widget::InitParams::TYPE_POPUP);	66 CreateParams(Widget::InitParams::TYPE_POPUP);

67 child_params.parent = toplevel->GetNativeView();	67 child_params.parent = toplevel->GetNativeView();

68 // \|child\| owns \|native_widget\|.	68 // \|child\| owns \|native_widget\|.

69 child_params.native_widget = new NativeWidgetAura(child);	69 child_params.native_widget = new NativeWidgetAura(child);

70 child->Init(child_params);	70 child->Init(child_params);

71	71

	72 child->GetInputMethod()->OnFocus();

	73

72 toplevel->CloseNow();	74 toplevel->CloseNow();

73	75

74 GetContext()->SetProperty(aura::client::kRootWindowInputMethodKey,	76 GetContext()->SetProperty(aura::client::kRootWindowInputMethodKey,

75 static_cast<ui::InputMethod*>(NULL));	77 static_cast<ui::InputMethod*>(NULL));

76 }	78 }

77	79

78 } // namespace views	80 } // namespace views

OLD	NEW