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

Side by Side Diff: ui/keyboard/keyboard_controller.cc

Issue 23533057: Makes native_widget_types forward declare ui::Cursor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux_aura 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/keyboard/keyboard_controller.h" 5 #include "ui/keyboard/keyboard_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "ui/aura/layout_manager.h" 8 #include "ui/aura/layout_manager.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/aura/window_delegate.h" 10 #include "ui/aura/window_delegate.h"
11 #include "ui/base/cursor/cursor.h"
11 #include "ui/base/hit_test.h" 12 #include "ui/base/hit_test.h"
12 #include "ui/base/ime/input_method.h" 13 #include "ui/base/ime/input_method.h"
13 #include "ui/base/ime/text_input_client.h" 14 #include "ui/base/ime/text_input_client.h"
14 #include "ui/base/ime/text_input_type.h" 15 #include "ui/base/ime/text_input_type.h"
15 #include "ui/gfx/path.h" 16 #include "ui/gfx/path.h"
16 #include "ui/gfx/rect.h" 17 #include "ui/gfx/rect.h"
17 #include "ui/gfx/skia_util.h" 18 #include "ui/gfx/skia_util.h"
18 #include "ui/keyboard/keyboard_controller_observer.h" 19 #include "ui/keyboard/keyboard_controller_observer.h"
19 #include "ui/keyboard/keyboard_controller_proxy.h" 20 #include "ui/keyboard/keyboard_controller_proxy.h"
20 21
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 const ui::InputMethod* input_method) { 233 const ui::InputMethod* input_method) {
233 DCHECK_EQ(input_method_, input_method); 234 DCHECK_EQ(input_method_, input_method);
234 input_method_ = NULL; 235 input_method_ = NULL;
235 } 236 }
236 237
237 bool KeyboardController::WillHideKeyboard() const { 238 bool KeyboardController::WillHideKeyboard() const {
238 return weak_factory_.HasWeakPtrs(); 239 return weak_factory_.HasWeakPtrs();
239 } 240 }
240 241
241 } // namespace keyboard 242 } // namespace keyboard
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698