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 3946 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3957 blink::WebPageVisibilityStateVisible; | 3957 blink::WebPageVisibilityStateVisible; |
3958 blink::WebPageVisibilityState override_state = current_state; | 3958 blink::WebPageVisibilityState override_state = current_state; |
3959 // TODO(jam): move this method to WebFrameClient. | 3959 // TODO(jam): move this method to WebFrameClient. |
3960 if (GetContentClient()->renderer()-> | 3960 if (GetContentClient()->renderer()-> |
3961 ShouldOverridePageVisibilityState(main_render_frame_.get(), | 3961 ShouldOverridePageVisibilityState(main_render_frame_.get(), |
3962 &override_state)) | 3962 &override_state)) |
3963 return override_state; | 3963 return override_state; |
3964 return current_state; | 3964 return current_state; |
3965 } | 3965 } |
3966 | 3966 |
3967 blink::WebPushClient* RenderViewImpl::webPushClient() { | |
3968 // TODO(mvanouwerkerk): Remove this method once the Push API code in Blink | |
3969 // has also switched over to Frame. | |
3970 return main_render_frame_->pushClient(); | |
3971 } | |
3972 | |
3973 void RenderViewImpl::draggableRegionsChanged() { | 3967 void RenderViewImpl::draggableRegionsChanged() { |
3974 FOR_EACH_OBSERVER( | 3968 FOR_EACH_OBSERVER( |
3975 RenderViewObserver, | 3969 RenderViewObserver, |
3976 observers_, | 3970 observers_, |
3977 DraggableRegionsChanged(webview()->mainFrame())); | 3971 DraggableRegionsChanged(webview()->mainFrame())); |
3978 } | 3972 } |
3979 | 3973 |
3980 #if defined(OS_ANDROID) | 3974 #if defined(OS_ANDROID) |
3981 WebContentDetectionResult RenderViewImpl::detectContentAround( | 3975 WebContentDetectionResult RenderViewImpl::detectContentAround( |
3982 const WebHitTestResult& touch_hit) { | 3976 const WebHitTestResult& touch_hit) { |
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4239 std::vector<gfx::Size> sizes; | 4233 std::vector<gfx::Size> sizes; |
4240 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4234 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4241 if (!url.isEmpty()) | 4235 if (!url.isEmpty()) |
4242 urls.push_back( | 4236 urls.push_back( |
4243 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4237 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4244 } | 4238 } |
4245 SendUpdateFaviconURL(urls); | 4239 SendUpdateFaviconURL(urls); |
4246 } | 4240 } |
4247 | 4241 |
4248 } // namespace content | 4242 } // namespace content |
OLD | NEW |