| 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 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 641 opener_suppressed_(false), | 641 opener_suppressed_(false), |
| 642 suppress_dialogs_until_swap_out_(false), | 642 suppress_dialogs_until_swap_out_(false), |
| 643 page_id_(-1), | 643 page_id_(-1), |
| 644 next_page_id_(params.next_page_id), | 644 next_page_id_(params.next_page_id), |
| 645 history_list_offset_(-1), | 645 history_list_offset_(-1), |
| 646 history_list_length_(0), | 646 history_list_length_(0), |
| 647 frames_in_progress_(0), | 647 frames_in_progress_(0), |
| 648 target_url_status_(TARGET_NONE), | 648 target_url_status_(TARGET_NONE), |
| 649 uses_temporary_zoom_level_(false), | 649 uses_temporary_zoom_level_(false), |
| 650 #if defined(OS_ANDROID) | 650 #if defined(OS_ANDROID) |
| 651 top_controls_constraints_(cc::BOTH), | 651 top_controls_constraints_(TOP_CONTROLS_STATE_BOTH), |
| 652 #endif | 652 #endif |
| 653 has_scrolled_focused_editable_node_into_rect_(false), | 653 has_scrolled_focused_editable_node_into_rect_(false), |
| 654 speech_recognition_dispatcher_(NULL), | 654 speech_recognition_dispatcher_(NULL), |
| 655 devtools_agent_(NULL), | 655 devtools_agent_(NULL), |
| 656 mouse_lock_dispatcher_(NULL), | 656 mouse_lock_dispatcher_(NULL), |
| 657 #if defined(OS_ANDROID) | 657 #if defined(OS_ANDROID) |
| 658 expected_content_intent_id_(0), | 658 expected_content_intent_id_(0), |
| 659 #endif | 659 #endif |
| 660 #if defined(OS_WIN) | 660 #if defined(OS_WIN) |
| 661 focused_plugin_id_(-1), | 661 focused_plugin_id_(-1), |
| (...skipping 3397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4059 std::vector<gfx::Size> sizes; | 4059 std::vector<gfx::Size> sizes; |
| 4060 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4060 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4061 if (!url.isEmpty()) | 4061 if (!url.isEmpty()) |
| 4062 urls.push_back( | 4062 urls.push_back( |
| 4063 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4063 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4064 } | 4064 } |
| 4065 SendUpdateFaviconURL(urls); | 4065 SendUpdateFaviconURL(urls); |
| 4066 } | 4066 } |
| 4067 | 4067 |
| 4068 } // namespace content | 4068 } // namespace content |
| OLD | NEW |