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/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 3636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3647 RenderViewNavigatedToHost(GURL(GetLoadingUrl(frame)).host(), | 3647 RenderViewNavigatedToHost(GURL(GetLoadingUrl(frame)).host(), |
3648 g_view_map.Get().size()); | 3648 g_view_map.Get().size()); |
3649 } | 3649 } |
3650 } | 3650 } |
3651 } | 3651 } |
3652 | 3652 |
3653 void RenderViewImpl::didClearWindowObject(WebFrame* frame, int world_id) { | 3653 void RenderViewImpl::didClearWindowObject(WebFrame* frame, int world_id) { |
3654 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 3654 FOR_EACH_OBSERVER(RenderViewObserver, observers_, |
3655 DidClearWindowObject(frame, world_id)); | 3655 DidClearWindowObject(frame, world_id)); |
3656 | 3656 |
3657 if ((enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) && (world_id == 0)) | 3657 if ((enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) && |
| 3658 (world_id == 0 || world_id == -1)) { |
3658 DomAutomationController::Install(this, frame); | 3659 DomAutomationController::Install(this, frame); |
| 3660 } |
3659 | 3661 |
3660 if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION) | 3662 if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION) |
3661 StatsCollectionController::Install(frame); | 3663 StatsCollectionController::Install(frame); |
3662 } | 3664 } |
3663 | 3665 |
3664 void RenderViewImpl::didCreateDocumentElement(WebFrame* frame) { | 3666 void RenderViewImpl::didCreateDocumentElement(WebFrame* frame) { |
3665 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 3667 FOR_EACH_OBSERVER(RenderViewObserver, observers_, |
3666 DidCreateDocumentElement(frame)); | 3668 DidCreateDocumentElement(frame)); |
3667 } | 3669 } |
3668 | 3670 |
(...skipping 2693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6362 for (size_t i = 0; i < icon_urls.size(); i++) { | 6364 for (size_t i = 0; i < icon_urls.size(); i++) { |
6363 WebURL url = icon_urls[i].iconURL(); | 6365 WebURL url = icon_urls[i].iconURL(); |
6364 if (!url.isEmpty()) | 6366 if (!url.isEmpty()) |
6365 urls.push_back(FaviconURL(url, | 6367 urls.push_back(FaviconURL(url, |
6366 ToFaviconType(icon_urls[i].iconType()))); | 6368 ToFaviconType(icon_urls[i].iconType()))); |
6367 } | 6369 } |
6368 SendUpdateFaviconURL(urls); | 6370 SendUpdateFaviconURL(urls); |
6369 } | 6371 } |
6370 | 6372 |
6371 } // namespace content | 6373 } // namespace content |
OLD | NEW |