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 1905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1916 NOTREACHED() << "Received script response for unknown request"; | 1916 NOTREACHED() << "Received script response for unknown request"; |
1917 } | 1917 } |
1918 } | 1918 } |
1919 | 1919 |
1920 void RenderViewHostImpl::OnDidZoomURL(double zoom_level, | 1920 void RenderViewHostImpl::OnDidZoomURL(double zoom_level, |
1921 bool remember, | 1921 bool remember, |
1922 const GURL& url) { | 1922 const GURL& url) { |
1923 HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>( | 1923 HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>( |
1924 HostZoomMap::GetForBrowserContext(GetProcess()->GetBrowserContext())); | 1924 HostZoomMap::GetForBrowserContext(GetProcess()->GetBrowserContext())); |
1925 if (remember) { | 1925 if (remember) { |
1926 host_zoom_map->SetZoomLevel(net::GetHostOrSpecFromURL(url), zoom_level); | 1926 host_zoom_map->SetZoomLevel( |
1927 std::string(), net::GetHostOrSpecFromURL(url), zoom_level); | |
sky
2013/02/11 17:13:26
Why don't you use the scheme from |url|?
| |
1927 } else { | 1928 } else { |
1928 host_zoom_map->SetTemporaryZoomLevel( | 1929 host_zoom_map->SetTemporaryZoomLevel( |
1929 GetProcess()->GetID(), GetRoutingID(), zoom_level); | 1930 GetProcess()->GetID(), GetRoutingID(), zoom_level); |
1930 } | 1931 } |
1931 } | 1932 } |
1932 | 1933 |
1933 void RenderViewHostImpl::OnMediaNotification(int64 player_cookie, | 1934 void RenderViewHostImpl::OnMediaNotification(int64 player_cookie, |
1934 bool has_video, | 1935 bool has_video, |
1935 bool has_audio, | 1936 bool has_audio, |
1936 bool is_playing) { | 1937 bool is_playing) { |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2060 GetRoutingID(), snapshot_id, snapshot_size, png)); | 2061 GetRoutingID(), snapshot_id, snapshot_size, png)); |
2061 return; | 2062 return; |
2062 } | 2063 } |
2063 } | 2064 } |
2064 | 2065 |
2065 Send(new ViewMsg_WindowSnapshotCompleted( | 2066 Send(new ViewMsg_WindowSnapshotCompleted( |
2066 GetRoutingID(), snapshot_id, gfx::Size(), png)); | 2067 GetRoutingID(), snapshot_id, gfx::Size(), png)); |
2067 } | 2068 } |
2068 | 2069 |
2069 } // namespace content | 2070 } // namespace content |
OLD | NEW |