| 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 1564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1575 } | 1575 } |
| 1576 | 1576 |
| 1577 return false; | 1577 return false; |
| 1578 } | 1578 } |
| 1579 | 1579 |
| 1580 // Stop loading the current page. | 1580 // Stop loading the current page. |
| 1581 void RenderViewImpl::OnStop() { | 1581 void RenderViewImpl::OnStop() { |
| 1582 if (webview()) | 1582 if (webview()) |
| 1583 webview()->mainFrame()->stopLoading(); | 1583 webview()->mainFrame()->stopLoading(); |
| 1584 FOR_EACH_OBSERVER(RenderViewObserver, observers_, OnStop()); | 1584 FOR_EACH_OBSERVER(RenderViewObserver, observers_, OnStop()); |
| 1585 main_render_frame_->OnStop(); |
| 1585 } | 1586 } |
| 1586 | 1587 |
| 1587 // Reload current focused frame. | 1588 // Reload current focused frame. |
| 1588 // E.g. called by right-clicking on the frame and picking "reload this frame". | 1589 // E.g. called by right-clicking on the frame and picking "reload this frame". |
| 1589 void RenderViewImpl::OnReloadFrame() { | 1590 void RenderViewImpl::OnReloadFrame() { |
| 1590 if (webview() && webview()->focusedFrame()) { | 1591 if (webview() && webview()->focusedFrame()) { |
| 1591 // We always obey the cache (ignore_cache=false) here. | 1592 // We always obey the cache (ignore_cache=false) here. |
| 1592 // TODO(evanm): perhaps we could allow shift-clicking the menu item to do | 1593 // TODO(evanm): perhaps we could allow shift-clicking the menu item to do |
| 1593 // a cache-ignoring reload of the frame. | 1594 // a cache-ignoring reload of the frame. |
| 1594 webview()->focusedFrame()->reload(false); | 1595 webview()->focusedFrame()->reload(false); |
| (...skipping 4642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6237 for (size_t i = 0; i < icon_urls.size(); i++) { | 6238 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6238 WebURL url = icon_urls[i].iconURL(); | 6239 WebURL url = icon_urls[i].iconURL(); |
| 6239 if (!url.isEmpty()) | 6240 if (!url.isEmpty()) |
| 6240 urls.push_back(FaviconURL(url, | 6241 urls.push_back(FaviconURL(url, |
| 6241 ToFaviconType(icon_urls[i].iconType()))); | 6242 ToFaviconType(icon_urls[i].iconType()))); |
| 6242 } | 6243 } |
| 6243 SendUpdateFaviconURL(urls); | 6244 SendUpdateFaviconURL(urls); |
| 6244 } | 6245 } |
| 6245 | 6246 |
| 6246 } // namespace content | 6247 } // namespace content |
| OLD | NEW |