| 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> |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 virtual bool DeleteRange(const ui::Range& range) OVERRIDE; | 172 virtual bool DeleteRange(const ui::Range& range) OVERRIDE; |
| 173 virtual bool GetTextFromRange( | 173 virtual bool GetTextFromRange( |
| 174 const ui::Range& range, | 174 const ui::Range& range, |
| 175 const base::Callback<void(const string16&)>& callback) OVERRIDE; | 175 const base::Callback<void(const string16&)>& callback) OVERRIDE; |
| 176 virtual void OnInputMethodChanged() OVERRIDE; | 176 virtual void OnInputMethodChanged() OVERRIDE; |
| 177 virtual bool ChangeTextDirectionAndLayoutAlignment( | 177 virtual bool ChangeTextDirectionAndLayoutAlignment( |
| 178 base::i18n::TextDirection direction) OVERRIDE; | 178 base::i18n::TextDirection direction) OVERRIDE; |
| 179 virtual views::View* GetOwnerViewOfTextInputClient() OVERRIDE; | 179 virtual views::View* GetOwnerViewOfTextInputClient() OVERRIDE; |
| 180 | 180 |
| 181 #if defined(TOUCH_UI) | 181 #if defined(TOUCH_UI) |
| 182 virtual void AcceleratedSurfaceSetIOSurface( | 182 virtual void AcceleratedSurfaceNew( |
| 183 int32 width, int32 height, uint64 surface_id) OVERRIDE; | 183 int32 width, |
| 184 int32 height, |
| 185 uint64* surface_id, |
| 186 TransportDIB::Handle *surface_handle) OVERRIDE; |
| 184 virtual void AcceleratedSurfaceBuffersSwapped( | 187 virtual void AcceleratedSurfaceBuffersSwapped( |
| 185 uint64 surface_id, | 188 uint64 surface_id, |
| 186 int32 route_id, | 189 int32 route_id, |
| 187 int gpu_host_id) OVERRIDE; | 190 int gpu_host_id) OVERRIDE; |
| 188 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; | 191 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; |
| 189 | 192 |
| 190 // CompositorObserver implementation: | 193 // CompositorObserver implementation: |
| 191 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; | 194 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; |
| 192 #endif | 195 #endif |
| 193 | 196 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 NotificationRegistrar registrar_; | 306 NotificationRegistrar registrar_; |
| 304 gfx::Rect keyboard_rect_; | 307 gfx::Rect keyboard_rect_; |
| 305 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> > | 308 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> > |
| 306 accelerated_surface_containers_; | 309 accelerated_surface_containers_; |
| 307 #endif | 310 #endif |
| 308 | 311 |
| 309 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews); | 312 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews); |
| 310 }; | 313 }; |
| 311 | 314 |
| 312 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ | 315 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ |
| OLD | NEW |