| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 UI_KEYBOARD_CONTENT_KEYBOARD_UI_CONTENT_H_ | 5 #ifndef UI_KEYBOARD_CONTENT_KEYBOARD_UI_CONTENT_H_ |
| 6 #define UI_KEYBOARD_CONTENT_KEYBOARD_UI_CONTENT_H_ | 6 #define UI_KEYBOARD_CONTENT_KEYBOARD_UI_CONTENT_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 9 #include "content/public/common/media_stream_request.h" | 10 #include "content/public/common/media_stream_request.h" |
| 10 #include "ui/aura/window_observer.h" | 11 #include "ui/aura/window_observer.h" |
| 11 #include "ui/base/ime/text_input_type.h" | 12 #include "ui/base/ime/text_input_type.h" |
| 12 #include "ui/keyboard/keyboard_export.h" | 13 #include "ui/keyboard/keyboard_export.h" |
| 13 #include "ui/keyboard/keyboard_ui.h" | 14 #include "ui/keyboard/keyboard_ui.h" |
| 14 | 15 |
| 15 namespace aura { | 16 namespace aura { |
| 16 class Window; | 17 class Window; |
| 17 } | 18 } |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 scoped_ptr<wm::Shadow> shadow_; | 122 scoped_ptr<wm::Shadow> shadow_; |
| 122 | 123 |
| 123 scoped_ptr<WindowBoundsChangeObserver> window_bounds_observer_; | 124 scoped_ptr<WindowBoundsChangeObserver> window_bounds_observer_; |
| 124 | 125 |
| 125 DISALLOW_COPY_AND_ASSIGN(KeyboardUIContent); | 126 DISALLOW_COPY_AND_ASSIGN(KeyboardUIContent); |
| 126 }; | 127 }; |
| 127 | 128 |
| 128 } // namespace keyboard | 129 } // namespace keyboard |
| 129 | 130 |
| 130 #endif // UI_KEYBOARD_CONTENT_KEYBOARD_UI_CONTENT_H_ | 131 #endif // UI_KEYBOARD_CONTENT_KEYBOARD_UI_CONTENT_H_ |
| OLD | NEW |