OLD | NEW |
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 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ | 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ |
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ | 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <string> | 10 #include <string> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
| 15 #include "base/memory/weak_ptr.h" |
15 #include "base/string16.h" | 16 #include "base/string16.h" |
16 #include "base/task.h" | |
17 #include "base/time.h" | 17 #include "base/time.h" |
18 #include "content/browser/renderer_host/render_widget_host_view.h" | 18 #include "content/browser/renderer_host/render_widget_host_view.h" |
19 #include "content/public/browser/notification_observer.h" | 19 #include "content/public/browser/notification_observer.h" |
20 #include "content/public/browser/notification_registrar.h" | 20 #include "content/public/browser/notification_registrar.h" |
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
22 #include "ui/base/ime/text_input_client.h" | 22 #include "ui/base/ime/text_input_client.h" |
23 #include "ui/gfx/compositor/compositor_observer.h" | 23 #include "ui/gfx/compositor/compositor_observer.h" |
24 #include "ui/gfx/native_widget_types.h" | 24 #include "ui/gfx/native_widget_types.h" |
25 #include "views/controls/native/native_view_host.h" | 25 #include "views/controls/native/native_view_host.h" |
26 #include "views/events/event.h" | 26 #include "views/events/event.h" |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
293 // Indicates if there is onging composition text. | 293 // Indicates if there is onging composition text. |
294 bool has_composition_text_; | 294 bool has_composition_text_; |
295 | 295 |
296 string16 tooltip_text_; | 296 string16 tooltip_text_; |
297 | 297 |
298 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 298 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
299 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_; | 299 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_; |
300 #endif | 300 #endif |
301 | 301 |
302 scoped_ptr<views::TouchSelectionController> touch_selection_controller_; | 302 scoped_ptr<views::TouchSelectionController> touch_selection_controller_; |
303 ScopedRunnableMethodFactory<RenderWidgetHostViewViews> | 303 base::WeakPtrFactory<RenderWidgetHostViewViews> weak_factory_; |
304 update_touch_selection_; | |
305 | 304 |
306 #if defined(TOUCH_UI) | 305 #if defined(TOUCH_UI) |
307 // used to register for keyboard visiblity notificatons. | 306 // used to register for keyboard visiblity notificatons. |
308 content::NotificationRegistrar registrar_; | 307 content::NotificationRegistrar registrar_; |
309 gfx::Rect keyboard_rect_; | 308 gfx::Rect keyboard_rect_; |
310 #endif | 309 #endif |
311 | 310 |
312 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 311 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
313 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > | 312 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > |
314 accelerated_surface_containers_; | 313 accelerated_surface_containers_; |
315 #endif | 314 #endif |
316 | 315 |
317 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews); | 316 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews); |
318 }; | 317 }; |
319 | 318 |
320 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ | 319 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ |
OLD | NEW |