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 2177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2188 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( | 2188 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( |
2189 routing_id_, plugin, active_url, screen_info_); | 2189 routing_id_, plugin, active_url, screen_info_); |
2190 widget->show(WebKit::WebNavigationPolicyIgnore); | 2190 widget->show(WebKit::WebNavigationPolicyIgnore); |
2191 return widget; | 2191 return widget; |
2192 #else // defined(ENABLE_PLUGINS) | 2192 #else // defined(ENABLE_PLUGINS) |
2193 NOTREACHED() << "CreatePepperFullscreenContainer: plugins disabled"; | 2193 NOTREACHED() << "CreatePepperFullscreenContainer: plugins disabled"; |
2194 return NULL; | 2194 return NULL; |
2195 #endif | 2195 #endif |
2196 } | 2196 } |
2197 | 2197 |
2198 WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace( | 2198 WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace() { |
2199 unsigned quota) { | |
2200 CHECK(session_storage_namespace_id_ != | 2199 CHECK(session_storage_namespace_id_ != |
2201 dom_storage::kInvalidSessionStorageNamespaceId); | 2200 dom_storage::kInvalidSessionStorageNamespaceId); |
2202 return new WebStorageNamespaceImpl(session_storage_namespace_id_); | 2201 return new WebStorageNamespaceImpl(session_storage_namespace_id_); |
2203 } | 2202 } |
2204 | 2203 |
2205 void RenderViewImpl::didAddMessageToConsole( | 2204 void RenderViewImpl::didAddMessageToConsole( |
2206 const WebConsoleMessage& message, const WebString& source_name, | 2205 const WebConsoleMessage& message, const WebString& source_name, |
2207 unsigned source_line) { | 2206 unsigned source_line) { |
2208 logging::LogSeverity log_severity = logging::LOG_VERBOSE; | 2207 logging::LogSeverity log_severity = logging::LOG_VERBOSE; |
2209 switch (message.level) { | 2208 switch (message.level) { |
(...skipping 4555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6765 WebURL url = icon_urls[i].iconURL(); | 6764 WebURL url = icon_urls[i].iconURL(); |
6766 if (!url.isEmpty()) | 6765 if (!url.isEmpty()) |
6767 urls.push_back(FaviconURL(url, | 6766 urls.push_back(FaviconURL(url, |
6768 ToFaviconType(icon_urls[i].iconType()))); | 6767 ToFaviconType(icon_urls[i].iconType()))); |
6769 } | 6768 } |
6770 SendUpdateFaviconURL(urls); | 6769 SendUpdateFaviconURL(urls); |
6771 } | 6770 } |
6772 | 6771 |
6773 | 6772 |
6774 } // namespace content | 6773 } // namespace content |
OLD | NEW |