Chromium Code Reviews| 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 4021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4032 params.is_fullscreen = is_fullscreen(); | 4032 params.is_fullscreen = is_fullscreen(); |
| 4033 OnResize(params); | 4033 OnResize(params); |
| 4034 } | 4034 } |
| 4035 | 4035 |
| 4036 void RenderViewImpl::SetDeviceColorProfileForTesting( | 4036 void RenderViewImpl::SetDeviceColorProfileForTesting( |
| 4037 const std::vector<char>& color_profile) { | 4037 const std::vector<char>& color_profile) { |
| 4038 SetDeviceColorProfile(color_profile); | 4038 SetDeviceColorProfile(color_profile); |
| 4039 } | 4039 } |
| 4040 | 4040 |
| 4041 void RenderViewImpl::ForceResizeForTesting(const gfx::Size& new_size) { | 4041 void RenderViewImpl::ForceResizeForTesting(const gfx::Size& new_size) { |
| 4042 gfx::Rect new_position(rootWindowRect().x, | 4042 gfx::Rect new_position(rootWindowRect().x, |
|
Avi (use Gerrit)
2015/02/03 01:30:42
rename; "position" doesn't make sense for a rect
bokan
2015/02/03 03:13:17
Done.
| |
| 4043 rootWindowRect().y, | 4043 rootWindowRect().y, |
| 4044 new_size.width(), | 4044 new_size.width(), |
| 4045 new_size.height()); | 4045 new_size.height()); |
| 4046 ResizeSynchronously(new_position, new_size); | 4046 ResizeSynchronously(new_position); |
| 4047 } | 4047 } |
| 4048 | 4048 |
| 4049 void RenderViewImpl::UseSynchronousResizeModeForTesting(bool enable) { | 4049 void RenderViewImpl::UseSynchronousResizeModeForTesting(bool enable) { |
| 4050 resizing_mode_selector_->set_is_synchronous_mode(enable); | 4050 resizing_mode_selector_->set_is_synchronous_mode(enable); |
| 4051 } | 4051 } |
| 4052 | 4052 |
| 4053 void RenderViewImpl::EnableAutoResizeForTesting(const gfx::Size& min_size, | 4053 void RenderViewImpl::EnableAutoResizeForTesting(const gfx::Size& min_size, |
| 4054 const gfx::Size& max_size) { | 4054 const gfx::Size& max_size) { |
| 4055 OnEnableAutoResize(min_size, max_size); | 4055 OnEnableAutoResize(min_size, max_size); |
| 4056 } | 4056 } |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4098 std::vector<gfx::Size> sizes; | 4098 std::vector<gfx::Size> sizes; |
| 4099 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4099 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4100 if (!url.isEmpty()) | 4100 if (!url.isEmpty()) |
| 4101 urls.push_back( | 4101 urls.push_back( |
| 4102 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4102 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4103 } | 4103 } |
| 4104 SendUpdateFaviconURL(urls); | 4104 SendUpdateFaviconURL(urls); |
| 4105 } | 4105 } |
| 4106 | 4106 |
| 4107 } // namespace content | 4107 } // namespace content |
| OLD | NEW |