| 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_AURA_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 // view, so we can ensure the window hasn't moved between copying from the | 660 // view, so we can ensure the window hasn't moved between copying from the |
| 661 // compositing surface and showing the disambiguation popup. | 661 // compositing surface and showing the disambiguation popup. |
| 662 gfx::Vector2dF disambiguation_scroll_offset_; | 662 gfx::Vector2dF disambiguation_scroll_offset_; |
| 663 | 663 |
| 664 BeginFrameObserverProxy begin_frame_observer_proxy_; | 664 BeginFrameObserverProxy begin_frame_observer_proxy_; |
| 665 | 665 |
| 666 // This flag when set ensures that we send over a notification to blink that | 666 // This flag when set ensures that we send over a notification to blink that |
| 667 // the current view has focus. Defaults to false. | 667 // the current view has focus. Defaults to false. |
| 668 bool set_focus_on_mouse_down_; | 668 bool set_focus_on_mouse_down_; |
| 669 | 669 |
| 670 float device_scale_factor_; |
| 671 |
| 670 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 672 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
| 671 | 673 |
| 672 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 674 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 673 }; | 675 }; |
| 674 | 676 |
| 675 } // namespace content | 677 } // namespace content |
| 676 | 678 |
| 677 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 679 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |