| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ |
| 7 | 7 |
| 8 #if defined(OS_MACOSX) | 8 #if defined(OS_MACOSX) |
| 9 #include <OpenGL/OpenGL.h> | 9 #include <OpenGL/OpenGL.h> |
| 10 #endif | 10 #endif |
| 11 | 11 |
| 12 #if defined(TOOLKIT_GTK) | |
| 13 #include <gdk/gdk.h> | |
| 14 #endif | |
| 15 | |
| 16 #include <string> | 12 #include <string> |
| 17 #include <vector> | 13 #include <vector> |
| 18 | 14 |
| 19 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 20 #include "base/callback_forward.h" | 16 #include "base/callback_forward.h" |
| 21 #include "base/timer/timer.h" | 17 #include "base/timer/timer.h" |
| 22 #include "content/common/content_export.h" | 18 #include "content/common/content_export.h" |
| 23 #include "content/port/browser/render_widget_host_view_port.h" | 19 #include "content/port/browser/render_widget_host_view_port.h" |
| 24 #include "ui/gfx/native_widget_types.h" | 20 #include "ui/gfx/native_widget_types.h" |
| 25 #include "ui/gfx/range/range.h" | 21 #include "ui/gfx/range/range.h" |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 uint32 renderer_frame_number_; | 171 uint32 renderer_frame_number_; |
| 176 | 172 |
| 177 base::OneShotTimer<RenderWidgetHostViewBase> flush_input_timer_; | 173 base::OneShotTimer<RenderWidgetHostViewBase> flush_input_timer_; |
| 178 | 174 |
| 179 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewBase); | 175 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewBase); |
| 180 }; | 176 }; |
| 181 | 177 |
| 182 } // namespace content | 178 } // namespace content |
| 183 | 179 |
| 184 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ | 180 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ |
| OLD | NEW |