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 4748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4759 return runModalAlertDialog(frame, message); | 4759 return runModalAlertDialog(frame, message); |
4760 } | 4760 } |
4761 | 4761 |
4762 void RenderViewImpl::LoadURLExternally( | 4762 void RenderViewImpl::LoadURLExternally( |
4763 WebKit::WebFrame* frame, | 4763 WebKit::WebFrame* frame, |
4764 const WebKit::WebURLRequest& request, | 4764 const WebKit::WebURLRequest& request, |
4765 WebKit::WebNavigationPolicy policy) { | 4765 WebKit::WebNavigationPolicy policy) { |
4766 loadURLExternally(frame, request, policy); | 4766 loadURLExternally(frame, request, policy); |
4767 } | 4767 } |
4768 | 4768 |
| 4769 void RenderViewImpl::DidStartLoading() { |
| 4770 didStartLoading(); |
| 4771 } |
| 4772 |
| 4773 void RenderViewImpl::DidStopLoading() { |
| 4774 didStopLoading(); |
| 4775 } |
| 4776 |
4769 void RenderViewImpl::DidPlay(WebKit::WebMediaPlayer* player) { | 4777 void RenderViewImpl::DidPlay(WebKit::WebMediaPlayer* player) { |
4770 Send(new ViewHostMsg_MediaNotification(routing_id_, | 4778 Send(new ViewHostMsg_MediaNotification(routing_id_, |
4771 reinterpret_cast<int64>(player), | 4779 reinterpret_cast<int64>(player), |
4772 player->hasVideo(), | 4780 player->hasVideo(), |
4773 player->hasAudio(), | 4781 player->hasAudio(), |
4774 true)); | 4782 true)); |
4775 } | 4783 } |
4776 | 4784 |
4777 void RenderViewImpl::DidPause(WebKit::WebMediaPlayer* player) { | 4785 void RenderViewImpl::DidPause(WebKit::WebMediaPlayer* player) { |
4778 Send(new ViewHostMsg_MediaNotification(routing_id_, | 4786 Send(new ViewHostMsg_MediaNotification(routing_id_, |
(...skipping 1960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6739 WebURL url = icon_urls[i].iconURL(); | 6747 WebURL url = icon_urls[i].iconURL(); |
6740 if (!url.isEmpty()) | 6748 if (!url.isEmpty()) |
6741 urls.push_back(FaviconURL(url, | 6749 urls.push_back(FaviconURL(url, |
6742 ToFaviconType(icon_urls[i].iconType()))); | 6750 ToFaviconType(icon_urls[i].iconType()))); |
6743 } | 6751 } |
6744 SendUpdateFaviconURL(urls); | 6752 SendUpdateFaviconURL(urls); |
6745 } | 6753 } |
6746 | 6754 |
6747 | 6755 |
6748 } // namespace content | 6756 } // namespace content |
OLD | NEW |