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 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" | 5 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "content/public/browser/notification_service.h" | 24 #include "content/public/browser/notification_service.h" |
25 #include "content/public/common/result_codes.h" | 25 #include "content/public/common/result_codes.h" |
26 #include "grit/ui_strings.h" | 26 #include "grit/ui_strings.h" |
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
28 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFact
ory.h" | 28 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFact
ory.h" |
29 #include "third_party/WebKit/Source/WebKit/chromium/public/x11/WebScreenInfoFact
ory.h" | 29 #include "third_party/WebKit/Source/WebKit/chromium/public/x11/WebScreenInfoFact
ory.h" |
30 #include "ui/base/clipboard/clipboard.h" | 30 #include "ui/base/clipboard/clipboard.h" |
31 #include "ui/base/text/text_elider.h" | 31 #include "ui/base/text/text_elider.h" |
32 #include "ui/gfx/canvas.h" | 32 #include "ui/gfx/canvas.h" |
33 #include "ui/gfx/canvas_skia.h" | 33 #include "ui/gfx/canvas_skia.h" |
| 34 #include "ui/views/ime/input_method.h" |
34 #include "views/events/event.h" | 35 #include "views/events/event.h" |
35 #include "views/ime/input_method.h" | |
36 #include "views/views_delegate.h" | 36 #include "views/views_delegate.h" |
37 #include "views/widget/tooltip_manager.h" | 37 #include "views/widget/tooltip_manager.h" |
38 #include "views/widget/widget.h" | 38 #include "views/widget/widget.h" |
39 | 39 |
40 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 40 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
41 #include "base/bind.h" | 41 #include "base/bind.h" |
42 #include "content/browser/gpu/gpu_process_host_ui_shim.h" | 42 #include "content/browser/gpu/gpu_process_host_ui_shim.h" |
43 #include "content/browser/renderer_host/accelerated_surface_container_linux.h" | 43 #include "content/browser/renderer_host/accelerated_surface_container_linux.h" |
44 #include "content/common/gpu/gpu_messages.h" | 44 #include "content/common/gpu/gpu_messages.h" |
45 #include "ui/gfx/gl/gl_bindings.h" | 45 #include "ui/gfx/gl/gl_bindings.h" |
46 #endif | 46 #endif |
47 | 47 |
48 #if defined(TOOLKIT_USES_GTK) | 48 #if defined(TOOLKIT_USES_GTK) |
| 49 #include <gdk/gdkx.h> |
49 #include <gtk/gtk.h> | 50 #include <gtk/gtk.h> |
50 #include <gtk/gtkwindow.h> | 51 #include <gtk/gtkwindow.h> |
51 #include <gdk/gdkx.h> | 52 |
52 #include "content/browser/renderer_host/gtk_window_utils.h" | 53 #include "content/browser/renderer_host/gtk_window_utils.h" |
53 #include "views/widget/native_widget_gtk.h" | 54 #include "views/widget/native_widget_gtk.h" |
54 #endif | 55 #endif |
55 | 56 |
56 #if defined(OS_POSIX) | 57 #if defined(OS_POSIX) |
57 #include "content/browser/renderer_host/gtk_window_utils.h" | 58 #include "content/browser/renderer_host/gtk_window_utils.h" |
58 #endif | 59 #endif |
59 | 60 |
60 static const int kMaxWindowWidth = 4000; | 61 static const int kMaxWindowWidth = 4000; |
61 static const int kMaxWindowHeight = 4000; | 62 static const int kMaxWindowHeight = 4000; |
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1166 for (std::vector< base::Callback<void(void)> >::const_iterator | 1167 for (std::vector< base::Callback<void(void)> >::const_iterator |
1167 it = on_compositing_ended_callbacks_.begin(); | 1168 it = on_compositing_ended_callbacks_.begin(); |
1168 it != on_compositing_ended_callbacks_.end(); ++it) { | 1169 it != on_compositing_ended_callbacks_.end(); ++it) { |
1169 it->Run(); | 1170 it->Run(); |
1170 } | 1171 } |
1171 on_compositing_ended_callbacks_.clear(); | 1172 on_compositing_ended_callbacks_.clear(); |
1172 compositor->RemoveObserver(this); | 1173 compositor->RemoveObserver(this); |
1173 } | 1174 } |
1174 | 1175 |
1175 #endif | 1176 #endif |
OLD | NEW |