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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
64 #include "content/public/common/ssl_status.h" | 64 #include "content/public/common/ssl_status.h" |
65 #include "content/public/common/three_d_api_types.h" | 65 #include "content/public/common/three_d_api_types.h" |
66 #include "content/public/common/url_constants.h" | 66 #include "content/public/common/url_constants.h" |
67 #include "content/public/common/url_utils.h" | 67 #include "content/public/common/url_utils.h" |
68 #include "content/public/common/web_preferences.h" | 68 #include "content/public/common/web_preferences.h" |
69 #include "content/public/renderer/content_renderer_client.h" | 69 #include "content/public/renderer/content_renderer_client.h" |
70 #include "content/public/renderer/document_state.h" | 70 #include "content/public/renderer/document_state.h" |
71 #include "content/public/renderer/navigation_state.h" | 71 #include "content/public/renderer/navigation_state.h" |
72 #include "content/public/renderer/render_view_observer.h" | 72 #include "content/public/renderer/render_view_observer.h" |
73 #include "content/public/renderer/render_view_visitor.h" | 73 #include "content/public/renderer/render_view_visitor.h" |
74 #include "content/renderer/accessibility/renderer_accessibility.h" | 74 #include "content/renderer/accessibility/renderer_accessibility.h" |
dmazzoni
2014/10/17 20:03:53
None of these are needed in this file - please rem
Sungmann Cho
2014/10/18 14:14:06
Done.
| |
75 #include "content/renderer/accessibility/renderer_accessibility_complete.h" | 75 #include "content/renderer/accessibility/renderer_accessibility_complete.h" |
76 #include "content/renderer/accessibility/renderer_accessibility_focus_only.h" | |
77 #include "content/renderer/browser_plugin/browser_plugin.h" | 76 #include "content/renderer/browser_plugin/browser_plugin.h" |
78 #include "content/renderer/browser_plugin/browser_plugin_manager.h" | 77 #include "content/renderer/browser_plugin/browser_plugin_manager.h" |
79 #include "content/renderer/devtools/devtools_agent.h" | 78 #include "content/renderer/devtools/devtools_agent.h" |
80 #include "content/renderer/disambiguation_popup_helper.h" | 79 #include "content/renderer/disambiguation_popup_helper.h" |
81 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" | 80 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" |
82 #include "content/renderer/drop_data_builder.h" | 81 #include "content/renderer/drop_data_builder.h" |
83 #include "content/renderer/gpu/render_widget_compositor.h" | 82 #include "content/renderer/gpu/render_widget_compositor.h" |
84 #include "content/renderer/history_controller.h" | 83 #include "content/renderer/history_controller.h" |
85 #include "content/renderer/history_serialization.h" | 84 #include "content/renderer/history_serialization.h" |
86 #include "content/renderer/idle_user_detector.h" | 85 #include "content/renderer/idle_user_detector.h" |
(...skipping 4105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4192 std::vector<gfx::Size> sizes; | 4191 std::vector<gfx::Size> sizes; |
4193 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4192 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4194 if (!url.isEmpty()) | 4193 if (!url.isEmpty()) |
4195 urls.push_back( | 4194 urls.push_back( |
4196 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4195 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4197 } | 4196 } |
4198 SendUpdateFaviconURL(urls); | 4197 SendUpdateFaviconURL(urls); |
4199 } | 4198 } |
4200 | 4199 |
4201 } // namespace content | 4200 } // namespace content |
OLD | NEW |