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/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "ui/aura/client/window_types.h" | 25 #include "ui/aura/client/window_types.h" |
26 #include "ui/aura/env.h" | 26 #include "ui/aura/env.h" |
27 #include "ui/aura/event.h" | 27 #include "ui/aura/event.h" |
28 #include "ui/aura/root_window.h" | 28 #include "ui/aura/root_window.h" |
29 #include "ui/aura/window.h" | 29 #include "ui/aura/window.h" |
30 #include "ui/aura/window_observer.h" | 30 #include "ui/aura/window_observer.h" |
31 #include "ui/base/gestures/gesture_recognizer.h" | 31 #include "ui/base/gestures/gesture_recognizer.h" |
32 #include "ui/base/hit_test.h" | 32 #include "ui/base/hit_test.h" |
33 #include "ui/base/ime/input_method.h" | 33 #include "ui/base/ime/input_method.h" |
34 #include "ui/base/ui_base_types.h" | 34 #include "ui/base/ui_base_types.h" |
| 35 #include "ui/compositor/compositor.h" |
| 36 #include "ui/compositor/layer.h" |
35 #include "ui/gfx/canvas.h" | 37 #include "ui/gfx/canvas.h" |
36 #include "ui/gfx/compositor/compositor.h" | |
37 #include "ui/gfx/compositor/layer.h" | |
38 #include "ui/gfx/monitor.h" | 38 #include "ui/gfx/monitor.h" |
39 #include "ui/gfx/screen.h" | 39 #include "ui/gfx/screen.h" |
40 #include "ui/gfx/skia_util.h" | 40 #include "ui/gfx/skia_util.h" |
41 | 41 |
42 using content::BrowserThread; | 42 using content::BrowserThread; |
43 using content::RenderWidgetHost; | 43 using content::RenderWidgetHost; |
44 using content::RenderWidgetHostImpl; | 44 using content::RenderWidgetHostImpl; |
45 using content::RenderWidgetHostView; | 45 using content::RenderWidgetHostView; |
46 using WebKit::WebTouchEvent; | 46 using WebKit::WebTouchEvent; |
47 | 47 |
(...skipping 1267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1315 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( | 1315 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( |
1316 RenderWidgetHost* widget) { | 1316 RenderWidgetHost* widget) { |
1317 return new RenderWidgetHostViewAura(widget); | 1317 return new RenderWidgetHostViewAura(widget); |
1318 } | 1318 } |
1319 | 1319 |
1320 // static | 1320 // static |
1321 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( | 1321 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( |
1322 WebKit::WebScreenInfo* results) { | 1322 WebKit::WebScreenInfo* results) { |
1323 GetScreenInfoForWindow(results, NULL); | 1323 GetScreenInfoForWindow(results, NULL); |
1324 } | 1324 } |
OLD | NEW |