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 1662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1673 void RenderViewHostImpl::OnDidZoomURL(double zoom_level, | 1673 void RenderViewHostImpl::OnDidZoomURL(double zoom_level, |
1674 bool remember, | 1674 bool remember, |
1675 const GURL& url) { | 1675 const GURL& url) { |
1676 HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>( | 1676 HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>( |
1677 HostZoomMap::GetForBrowserContext(GetProcess()->GetBrowserContext())); | 1677 HostZoomMap::GetForBrowserContext(GetProcess()->GetBrowserContext())); |
1678 if (remember) { | 1678 if (remember) { |
1679 host_zoom_map-> | 1679 host_zoom_map-> |
1680 SetZoomLevelForHost(net::GetHostOrSpecFromURL(url), zoom_level); | 1680 SetZoomLevelForHost(net::GetHostOrSpecFromURL(url), zoom_level); |
1681 } else { | 1681 } else { |
1682 host_zoom_map->SetTemporaryZoomLevel( | 1682 host_zoom_map->SetTemporaryZoomLevel( |
1683 GetProcess()->GetID(), GetRoutingID(), zoom_level); | 1683 GetProcess()->GetID(), GetRoutingID(), net::GetHostOrSpecFromURL(url), |
| 1684 zoom_level); |
1684 } | 1685 } |
1685 } | 1686 } |
1686 | 1687 |
1687 void RenderViewHostImpl::OnRequestDesktopNotificationPermission( | 1688 void RenderViewHostImpl::OnRequestDesktopNotificationPermission( |
1688 const GURL& source_origin, int callback_context) { | 1689 const GURL& source_origin, int callback_context) { |
1689 GetContentClient()->browser()->RequestDesktopNotificationPermission( | 1690 GetContentClient()->browser()->RequestDesktopNotificationPermission( |
1690 source_origin, callback_context, GetProcess()->GetID(), GetRoutingID()); | 1691 source_origin, callback_context, GetProcess()->GetID(), GetRoutingID()); |
1691 } | 1692 } |
1692 | 1693 |
1693 void RenderViewHostImpl::OnShowDesktopNotification( | 1694 void RenderViewHostImpl::OnShowDesktopNotification( |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1778 return true; | 1779 return true; |
1779 } | 1780 } |
1780 | 1781 |
1781 void RenderViewHostImpl::AttachToFrameTree() { | 1782 void RenderViewHostImpl::AttachToFrameTree() { |
1782 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1783 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1783 | 1784 |
1784 frame_tree->ResetForMainFrameSwap(); | 1785 frame_tree->ResetForMainFrameSwap(); |
1785 } | 1786 } |
1786 | 1787 |
1787 } // namespace content | 1788 } // namespace content |
OLD | NEW |