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

Side by Side Diff: ui/views/ime/input_method_base.cc

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « ui/views/focus/focus_manager_unittest.cc ('k') | ui/views/ime/input_method_gtk.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 (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 #include "ui/base/ime/text_input_client.h" 5 #include "ui/base/ime/text_input_client.h"
6 #include "ui/views/ime/input_method_base.h" 6 #include "ui/views/ime/input_method_base.h"
7 #include "ui/views/ime/text_input_type_tracker.h" 7 #include "ui/views/ime/text_input_type_tracker.h"
8 #include "ui/views/widget/widget.h"
9 #include "views/view.h" 8 #include "views/view.h"
9 #include "views/widget/widget.h"
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 12
13 namespace views { 13 namespace views {
14 14
15 InputMethodBase::InputMethodBase() 15 InputMethodBase::InputMethodBase()
16 : delegate_(NULL), 16 : delegate_(NULL),
17 widget_(NULL), 17 widget_(NULL),
18 widget_focused_(false) { 18 widget_focused_(false) {
19 } 19 }
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 *rect = GetFocusedView()->ConvertRectToWidget(client->GetCaretBounds()); 123 *rect = GetFocusedView()->ConvertRectToWidget(client->GetCaretBounds());
124 124
125 // We need to do coordinate conversion if the focused view is inside a child 125 // We need to do coordinate conversion if the focused view is inside a child
126 // Widget. 126 // Widget.
127 if (GetFocusedView()->GetWidget() != widget_) 127 if (GetFocusedView()->GetWidget() != widget_)
128 return Widget::ConvertRect(GetFocusedView()->GetWidget(), widget_, rect); 128 return Widget::ConvertRect(GetFocusedView()->GetWidget(), widget_, rect);
129 return true; 129 return true;
130 } 130 }
131 } // namespace views 131 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/focus/focus_manager_unittest.cc ('k') | ui/views/ime/input_method_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698