OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2137 popup_type); | 2137 popup_type); |
2138 return widget->webwidget(); | 2138 return widget->webwidget(); |
2139 } | 2139 } |
2140 | 2140 |
2141 webkit::ppapi::FullscreenContainer* | 2141 webkit::ppapi::FullscreenContainer* |
2142 RenderView::CreatePepperFullscreenContainer( | 2142 RenderView::CreatePepperFullscreenContainer( |
2143 webkit::ppapi::PluginInstance* plugin) { | 2143 webkit::ppapi::PluginInstance* plugin) { |
2144 RenderWidgetFullscreenPepper* widget = | 2144 RenderWidgetFullscreenPepper* widget = |
2145 RenderWidgetFullscreenPepper::Create(routing_id_, render_thread_, plugin); | 2145 RenderWidgetFullscreenPepper::Create(routing_id_, render_thread_, plugin); |
2146 widget->show(WebKit::WebNavigationPolicyIgnore); | 2146 widget->show(WebKit::WebNavigationPolicyIgnore); |
2147 return widget->container(); | 2147 return widget; |
2148 } | 2148 } |
2149 | 2149 |
2150 WebStorageNamespace* RenderView::createSessionStorageNamespace(unsigned quota) { | 2150 WebStorageNamespace* RenderView::createSessionStorageNamespace(unsigned quota) { |
2151 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) | 2151 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
2152 return WebStorageNamespace::createSessionStorageNamespace(quota); | 2152 return WebStorageNamespace::createSessionStorageNamespace(quota); |
2153 CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId); | 2153 CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId); |
2154 return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION, | 2154 return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION, |
2155 session_storage_namespace_id_); | 2155 session_storage_namespace_id_); |
2156 } | 2156 } |
2157 | 2157 |
(...skipping 3608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5766 external_popup_menu_.reset(); | 5766 external_popup_menu_.reset(); |
5767 } | 5767 } |
5768 #endif | 5768 #endif |
5769 | 5769 |
5770 void RenderView::AddErrorToRootConsole(const string16& message) { | 5770 void RenderView::AddErrorToRootConsole(const string16& message) { |
5771 if (webview() && webview()->mainFrame()) { | 5771 if (webview() && webview()->mainFrame()) { |
5772 webview()->mainFrame()->addMessageToConsole( | 5772 webview()->mainFrame()->addMessageToConsole( |
5773 WebConsoleMessage(WebConsoleMessage::LevelError, message)); | 5773 WebConsoleMessage(WebConsoleMessage::LevelError, message)); |
5774 } | 5774 } |
5775 } | 5775 } |
OLD | NEW |