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 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
821 // This ensures we are in a unique origin that others cannot script. | 821 // This ensures we are in a unique origin that others cannot script. |
822 if (is_swapped_out_ && webview()->mainFrame()->isWebLocalFrame()) | 822 if (is_swapped_out_ && webview()->mainFrame()->isWebLocalFrame()) |
823 main_render_frame_->NavigateToSwappedOutURL(); | 823 main_render_frame_->NavigateToSwappedOutURL(); |
824 } | 824 } |
825 | 825 |
826 RenderViewImpl::~RenderViewImpl() { | 826 RenderViewImpl::~RenderViewImpl() { |
827 for (BitmapMap::iterator it = disambiguation_bitmaps_.begin(); | 827 for (BitmapMap::iterator it = disambiguation_bitmaps_.begin(); |
828 it != disambiguation_bitmaps_.end(); | 828 it != disambiguation_bitmaps_.end(); |
829 ++it) | 829 ++it) |
830 delete it->second; | 830 delete it->second; |
831 base::debug::TraceLog::GetInstance()->RemoveProcessLabel(routing_id_); | 831 base::trace_event::TraceLog::GetInstance()->RemoveProcessLabel(routing_id_); |
832 | 832 |
833 // If file chooser is still waiting for answer, dispatch empty answer. | 833 // If file chooser is still waiting for answer, dispatch empty answer. |
834 while (!file_chooser_completions_.empty()) { | 834 while (!file_chooser_completions_.empty()) { |
835 if (file_chooser_completions_.front()->completion) { | 835 if (file_chooser_completions_.front()->completion) { |
836 file_chooser_completions_.front()->completion->didChooseFile( | 836 file_chooser_completions_.front()->completion->didChooseFile( |
837 WebVector<WebString>()); | 837 WebVector<WebString>()); |
838 } | 838 } |
839 file_chooser_completions_.pop_front(); | 839 file_chooser_completions_.pop_front(); |
840 } | 840 } |
841 | 841 |
(...skipping 3216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4058 std::vector<gfx::Size> sizes; | 4058 std::vector<gfx::Size> sizes; |
4059 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4059 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4060 if (!url.isEmpty()) | 4060 if (!url.isEmpty()) |
4061 urls.push_back( | 4061 urls.push_back( |
4062 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4062 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4063 } | 4063 } |
4064 SendUpdateFaviconURL(urls); | 4064 SendUpdateFaviconURL(urls); |
4065 } | 4065 } |
4066 | 4066 |
4067 } // namespace content | 4067 } // namespace content |
OLD | NEW |