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 <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "content/public/common/media_stream_request.h" | 11 #include "content/public/common/media_stream_request.h" |
11 #include "ui/aura/window_observer.h" | 12 #include "ui/aura/window_observer.h" |
12 #include "ui/base/ime/text_input_type.h" | 13 #include "ui/base/ime/text_input_type.h" |
13 #include "ui/keyboard/keyboard_export.h" | 14 #include "ui/keyboard/keyboard_export.h" |
14 #include "ui/keyboard/keyboard_ui.h" | 15 #include "ui/keyboard/keyboard_ui.h" |
15 | 16 |
16 namespace aura { | 17 namespace aura { |
17 class Window; | 18 class Window; |
18 } | 19 } |
19 namespace content { | 20 namespace content { |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 // position while the keyboard is displayed. Any window repositioning | 112 // position while the keyboard is displayed. Any window repositioning |
112 // invalidates insets for overscrolling. | 113 // invalidates insets for overscrolling. |
113 void AddBoundsChangedObserver(aura::Window* window); | 114 void AddBoundsChangedObserver(aura::Window* window); |
114 | 115 |
115 // The BrowserContext to use for creating the WebContents hosting the | 116 // The BrowserContext to use for creating the WebContents hosting the |
116 // keyboard. | 117 // keyboard. |
117 content::BrowserContext* browser_context_; | 118 content::BrowserContext* browser_context_; |
118 | 119 |
119 const GURL default_url_; | 120 const GURL default_url_; |
120 | 121 |
121 scoped_ptr<content::WebContents> keyboard_contents_; | 122 std::unique_ptr<content::WebContents> keyboard_contents_; |
122 scoped_ptr<wm::Shadow> shadow_; | 123 std::unique_ptr<wm::Shadow> shadow_; |
123 | 124 |
124 scoped_ptr<WindowBoundsChangeObserver> window_bounds_observer_; | 125 std::unique_ptr<WindowBoundsChangeObserver> window_bounds_observer_; |
125 | 126 |
126 DISALLOW_COPY_AND_ASSIGN(KeyboardUIContent); | 127 DISALLOW_COPY_AND_ASSIGN(KeyboardUIContent); |
127 }; | 128 }; |
128 | 129 |
129 } // namespace keyboard | 130 } // namespace keyboard |
130 | 131 |
131 #endif // UI_KEYBOARD_CONTENT_KEYBOARD_UI_CONTENT_H_ | 132 #endif // UI_KEYBOARD_CONTENT_KEYBOARD_UI_CONTENT_H_ |
OLD | NEW |