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_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 #include "third_party/skia/include/core/SkBitmap.h" | 61 #include "third_party/skia/include/core/SkBitmap.h" |
62 #if defined(OS_WIN) | 62 #if defined(OS_WIN) |
63 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFact
ory.h" | 63 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFact
ory.h" |
64 #endif | 64 #endif |
65 #include "ui/gfx/native_widget_types.h" | 65 #include "ui/gfx/native_widget_types.h" |
66 #include "webkit/fileapi/isolated_context.h" | 66 #include "webkit/fileapi/isolated_context.h" |
67 #include "webkit/glue/webaccessibility.h" | 67 #include "webkit/glue/webaccessibility.h" |
68 #include "webkit/glue/webdropdata.h" | 68 #include "webkit/glue/webdropdata.h" |
69 | 69 |
70 using base::TimeDelta; | 70 using base::TimeDelta; |
| 71 using content::NativeWebKeyboardEvent; |
71 using WebKit::WebConsoleMessage; | 72 using WebKit::WebConsoleMessage; |
72 using WebKit::WebDragOperation; | 73 using WebKit::WebDragOperation; |
73 using WebKit::WebDragOperationNone; | 74 using WebKit::WebDragOperationNone; |
74 using WebKit::WebDragOperationsMask; | 75 using WebKit::WebDragOperationsMask; |
75 using WebKit::WebInputEvent; | 76 using WebKit::WebInputEvent; |
76 using WebKit::WebMediaPlayerAction; | 77 using WebKit::WebMediaPlayerAction; |
77 using WebKit::WebPluginAction; | 78 using WebKit::WebPluginAction; |
78 | 79 |
79 namespace { | 80 namespace { |
80 | 81 |
(...skipping 1754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1835 // can cause navigations to be ignored in OnMsgNavigate. | 1836 // can cause navigations to be ignored in OnMsgNavigate. |
1836 is_waiting_for_beforeunload_ack_ = false; | 1837 is_waiting_for_beforeunload_ack_ = false; |
1837 is_waiting_for_unload_ack_ = false; | 1838 is_waiting_for_unload_ack_ = false; |
1838 } | 1839 } |
1839 | 1840 |
1840 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 1841 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
1841 STLDeleteValues(&power_save_blockers_); | 1842 STLDeleteValues(&power_save_blockers_); |
1842 } | 1843 } |
1843 | 1844 |
1844 } // namespace content | 1845 } // namespace content |
OLD | NEW |