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 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #include "ui/aura/client/scoped_tooltip_disabler.h" | 55 #include "ui/aura/client/scoped_tooltip_disabler.h" |
56 #include "ui/aura/client/screen_position_client.h" | 56 #include "ui/aura/client/screen_position_client.h" |
57 #include "ui/aura/client/tooltip_client.h" | 57 #include "ui/aura/client/tooltip_client.h" |
58 #include "ui/aura/client/transient_window_client.h" | 58 #include "ui/aura/client/transient_window_client.h" |
59 #include "ui/aura/client/window_tree_client.h" | 59 #include "ui/aura/client/window_tree_client.h" |
60 #include "ui/aura/env.h" | 60 #include "ui/aura/env.h" |
61 #include "ui/aura/window.h" | 61 #include "ui/aura/window.h" |
62 #include "ui/aura/window_event_dispatcher.h" | 62 #include "ui/aura/window_event_dispatcher.h" |
63 #include "ui/aura/window_observer.h" | 63 #include "ui/aura/window_observer.h" |
64 #include "ui/aura/window_tracker.h" | 64 #include "ui/aura/window_tracker.h" |
| 65 #include "ui/aura/window_tree_host.h" |
65 #include "ui/base/clipboard/scoped_clipboard_writer.h" | 66 #include "ui/base/clipboard/scoped_clipboard_writer.h" |
66 #include "ui/base/hit_test.h" | 67 #include "ui/base/hit_test.h" |
67 #include "ui/base/ime/input_method.h" | 68 #include "ui/base/ime/input_method.h" |
68 #include "ui/base/ui_base_types.h" | 69 #include "ui/base/ui_base_types.h" |
69 #include "ui/compositor/compositor_vsync_manager.h" | 70 #include "ui/compositor/compositor_vsync_manager.h" |
70 #include "ui/compositor/layer.h" | 71 #include "ui/compositor/layer.h" |
71 #include "ui/events/event.h" | 72 #include "ui/events/event.h" |
72 #include "ui/events/event_utils.h" | 73 #include "ui/events/event_utils.h" |
73 #include "ui/events/gestures/gesture_recognizer.h" | 74 #include "ui/events/gestures/gesture_recognizer.h" |
74 #include "ui/gfx/canvas.h" | 75 #include "ui/gfx/canvas.h" |
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
741 return false; | 742 return false; |
742 | 743 |
743 return true; | 744 return true; |
744 #endif | 745 #endif |
745 } | 746 } |
746 | 747 |
747 scoped_ptr<ResizeLock> RenderWidgetHostViewAura::CreateResizeLock( | 748 scoped_ptr<ResizeLock> RenderWidgetHostViewAura::CreateResizeLock( |
748 bool defer_compositor_lock) { | 749 bool defer_compositor_lock) { |
749 gfx::Size desired_size = window_->bounds().size(); | 750 gfx::Size desired_size = window_->bounds().size(); |
750 return scoped_ptr<ResizeLock>(new CompositorResizeLock( | 751 return scoped_ptr<ResizeLock>(new CompositorResizeLock( |
751 window_->GetHost()->dispatcher(), | 752 window_->GetHost(), |
752 desired_size, | 753 desired_size, |
753 defer_compositor_lock, | 754 defer_compositor_lock, |
754 base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs))); | 755 base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs))); |
755 } | 756 } |
756 | 757 |
757 void RenderWidgetHostViewAura::RequestCopyOfOutput( | 758 void RenderWidgetHostViewAura::RequestCopyOfOutput( |
758 scoped_ptr<cc::CopyOutputRequest> request) { | 759 scoped_ptr<cc::CopyOutputRequest> request) { |
759 window_->layer()->RequestCopyOfOutput(request.Pass()); | 760 window_->layer()->RequestCopyOfOutput(request.Pass()); |
760 } | 761 } |
761 | 762 |
(...skipping 2843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3605 RenderWidgetHost* widget) { | 3606 RenderWidgetHost* widget) { |
3606 return new RenderWidgetHostViewAura(widget); | 3607 return new RenderWidgetHostViewAura(widget); |
3607 } | 3608 } |
3608 | 3609 |
3609 // static | 3610 // static |
3610 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3611 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
3611 GetScreenInfoForWindow(results, NULL); | 3612 GetScreenInfoForWindow(results, NULL); |
3612 } | 3613 } |
3613 | 3614 |
3614 } // namespace content | 3615 } // namespace content |
OLD | NEW |