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 23 matching lines...) Expand all Loading... |
34 #include "ui/base/ime/input_method.h" | 34 #include "ui/base/ime/input_method.h" |
35 #include "ui/base/ui_base_types.h" | 35 #include "ui/base/ui_base_types.h" |
36 #include "ui/compositor/compositor.h" | 36 #include "ui/compositor/compositor.h" |
37 #include "ui/compositor/layer.h" | 37 #include "ui/compositor/layer.h" |
38 #include "ui/gfx/canvas.h" | 38 #include "ui/gfx/canvas.h" |
39 #include "ui/gfx/monitor.h" | 39 #include "ui/gfx/monitor.h" |
40 #include "ui/gfx/screen.h" | 40 #include "ui/gfx/screen.h" |
41 #include "ui/gfx/skia_util.h" | 41 #include "ui/gfx/skia_util.h" |
42 | 42 |
43 using content::BrowserThread; | 43 using content::BrowserThread; |
| 44 using content::NativeWebKeyboardEvent; |
44 using content::RenderWidgetHost; | 45 using content::RenderWidgetHost; |
45 using content::RenderWidgetHostImpl; | 46 using content::RenderWidgetHostImpl; |
46 using content::RenderWidgetHostView; | 47 using content::RenderWidgetHostView; |
47 using WebKit::WebTouchEvent; | 48 using WebKit::WebTouchEvent; |
48 | 49 |
49 namespace { | 50 namespace { |
50 | 51 |
51 // In mouse lock mode, we need to prevent the (invisible) cursor from hitting | 52 // In mouse lock mode, we need to prevent the (invisible) cursor from hitting |
52 // the border of the view, in order to get valid movement information. However, | 53 // the border of the view, in order to get valid movement information. However, |
53 // forcing the cursor back to the center of the view after each mouse move | 54 // forcing the cursor back to the center of the view after each mouse move |
(...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1293 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( | 1294 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( |
1294 RenderWidgetHost* widget) { | 1295 RenderWidgetHost* widget) { |
1295 return new RenderWidgetHostViewAura(widget); | 1296 return new RenderWidgetHostViewAura(widget); |
1296 } | 1297 } |
1297 | 1298 |
1298 // static | 1299 // static |
1299 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( | 1300 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( |
1300 WebKit::WebScreenInfo* results) { | 1301 WebKit::WebScreenInfo* results) { |
1301 GetScreenInfoForWindow(results, NULL); | 1302 GetScreenInfoForWindow(results, NULL); |
1302 } | 1303 } |
OLD | NEW |