Chromium Code Reviews| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 #include "webkit/glue/webaccessibility.h" | 60 #include "webkit/glue/webaccessibility.h" |
| 61 #include "webkit/glue/webdropdata.h" | 61 #include "webkit/glue/webdropdata.h" |
| 62 | 62 |
| 63 using base::TimeDelta; | 63 using base::TimeDelta; |
| 64 using content::BrowserContext; | 64 using content::BrowserContext; |
| 65 using content::BrowserMessageFilter; | 65 using content::BrowserMessageFilter; |
| 66 using content::BrowserThread; | 66 using content::BrowserThread; |
| 67 using content::DomOperationNotificationDetails; | 67 using content::DomOperationNotificationDetails; |
| 68 using content::DOMStorageContext; | 68 using content::DOMStorageContext; |
| 69 using content::HostZoomMap; | 69 using content::HostZoomMap; |
| 70 using content::RenderWidgetHost; | |
| 70 using content::RenderViewHostDelegate; | 71 using content::RenderViewHostDelegate; |
| 71 using content::SessionStorageNamespace; | 72 using content::SessionStorageNamespace; |
| 72 using content::SiteInstance; | 73 using content::SiteInstance; |
| 73 using content::UserMetricsAction; | 74 using content::UserMetricsAction; |
| 74 using WebKit::WebConsoleMessage; | 75 using WebKit::WebConsoleMessage; |
| 75 using WebKit::WebDragOperation; | 76 using WebKit::WebDragOperation; |
| 76 using WebKit::WebDragOperationNone; | 77 using WebKit::WebDragOperationNone; |
| 77 using WebKit::WebDragOperationsMask; | 78 using WebKit::WebDragOperationsMask; |
| 78 using WebKit::WebInputEvent; | 79 using WebKit::WebInputEvent; |
| 79 using WebKit::WebMediaPlayerAction; | 80 using WebKit::WebMediaPlayerAction; |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 93 case WebKit::WebTextDirectionRightToLeft: | 94 case WebKit::WebTextDirectionRightToLeft: |
| 94 return base::i18n::RIGHT_TO_LEFT; | 95 return base::i18n::RIGHT_TO_LEFT; |
| 95 default: | 96 default: |
| 96 NOTREACHED(); | 97 NOTREACHED(); |
| 97 return base::i18n::UNKNOWN_DIRECTION; | 98 return base::i18n::UNKNOWN_DIRECTION; |
| 98 } | 99 } |
| 99 } | 100 } |
| 100 | 101 |
| 101 } // namespace | 102 } // namespace |
| 102 | 103 |
| 104 namespace content { | |
| 105 | |
| 103 /////////////////////////////////////////////////////////////////////////////// | 106 /////////////////////////////////////////////////////////////////////////////// |
| 104 // RenderViewHost, public: | 107 // RenderViewHost, public: |
| 105 | 108 |
| 106 // static | 109 // static |
| 107 RenderViewHost* RenderViewHost::FromID(int render_process_id, | 110 RenderViewHost* RenderViewHost::FromID(int render_process_id, |
| 108 int render_view_id) { | 111 int render_view_id) { |
| 109 content::RenderProcessHost* process = | 112 content::RenderProcessHost* process = |
| 110 content::RenderProcessHost::FromID(render_process_id); | 113 content::RenderProcessHost::FromID(render_process_id); |
|
jam
2012/03/05 23:59:28
ditto
Jói
2012/03/06 16:38:55
Done.
| |
| 111 if (!process) | 114 if (!process) |
| 112 return NULL; | 115 return NULL; |
| 113 RenderWidgetHost* widget = RenderWidgetHost::FromIPCChannelListener( | 116 RenderWidgetHost* widget = RenderWidgetHost::FromIPCChannelListener( |
| 114 process->GetListenerByID(render_view_id)); | 117 process->GetListenerByID(render_view_id)); |
| 115 if (!widget || !widget->IsRenderView()) | 118 if (!widget || !widget->IsRenderView()) |
| 116 return NULL; | 119 return NULL; |
| 117 return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(widget)); | 120 return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(widget)); |
| 118 } | 121 } |
| 119 | 122 |
| 120 // static | 123 // static |
| (...skipping 1541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1662 // Whenever we change swap out state, we should not be waiting for | 1665 // Whenever we change swap out state, we should not be waiting for |
| 1663 // beforeunload or unload acks. We clear them here to be safe, since they | 1666 // beforeunload or unload acks. We clear them here to be safe, since they |
| 1664 // can cause navigations to be ignored in OnMsgNavigate. | 1667 // can cause navigations to be ignored in OnMsgNavigate. |
| 1665 is_waiting_for_beforeunload_ack_ = false; | 1668 is_waiting_for_beforeunload_ack_ = false; |
| 1666 is_waiting_for_unload_ack_ = false; | 1669 is_waiting_for_unload_ack_ = false; |
| 1667 } | 1670 } |
| 1668 | 1671 |
| 1669 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 1672 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
| 1670 STLDeleteValues(&power_save_blockers_); | 1673 STLDeleteValues(&power_save_blockers_); |
| 1671 } | 1674 } |
| 1675 | |
| 1676 } // namespace content | |
| OLD | NEW |