Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 11577031: Exclude more plugins code for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/bind.h" 10 #include "base/bind.h"
(...skipping 1839 matching lines...) Expand 10 before | Expand all | Expand 10 after
1850 // will have to close the first one before another one can be shown. 1850 // will have to close the first one before another one can be shown.
1851 if (external_popup_menu_.get()) 1851 if (external_popup_menu_.get())
1852 return NULL; 1852 return NULL;
1853 external_popup_menu_.reset( 1853 external_popup_menu_.reset(
1854 new ExternalPopupMenu(this, popup_menu_info, popup_menu_client)); 1854 new ExternalPopupMenu(this, popup_menu_info, popup_menu_client));
1855 return external_popup_menu_.get(); 1855 return external_popup_menu_.get();
1856 } 1856 }
1857 1857
1858 RenderWidgetFullscreenPepper* RenderViewImpl::CreatePepperFullscreenContainer( 1858 RenderWidgetFullscreenPepper* RenderViewImpl::CreatePepperFullscreenContainer(
1859 webkit::ppapi::PluginInstance* plugin) { 1859 webkit::ppapi::PluginInstance* plugin) {
1860 #if defined(ENABLE_PLUGINS)
1860 GURL active_url; 1861 GURL active_url;
1861 if (webview() && webview()->mainFrame()) 1862 if (webview() && webview()->mainFrame())
1862 active_url = GURL(webview()->mainFrame()->document().url()); 1863 active_url = GURL(webview()->mainFrame()->document().url());
1863 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( 1864 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create(
1864 routing_id_, plugin, active_url, screen_info_); 1865 routing_id_, plugin, active_url, screen_info_);
1865 widget->show(WebKit::WebNavigationPolicyIgnore); 1866 widget->show(WebKit::WebNavigationPolicyIgnore);
1866 return widget; 1867 return widget;
1868 #else // defined(ENABLE_PLUGINS)
1869 return NULL;
1870 #endif
1867 } 1871 }
1868 1872
1869 WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace( 1873 WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace(
1870 unsigned quota) { 1874 unsigned quota) {
1871 CHECK(session_storage_namespace_id_ != 1875 CHECK(session_storage_namespace_id_ !=
1872 dom_storage::kInvalidSessionStorageNamespaceId); 1876 dom_storage::kInvalidSessionStorageNamespaceId);
1873 return new WebStorageNamespaceImpl(session_storage_namespace_id_); 1877 return new WebStorageNamespaceImpl(session_storage_namespace_id_);
1874 } 1878 }
1875 1879
1876 WebKit::WebCompositorOutputSurface* RenderViewImpl::createOutputSurface() { 1880 WebKit::WebCompositorOutputSurface* RenderViewImpl::createOutputSurface() {
(...skipping 4608 matching lines...) Expand 10 before | Expand all | Expand 10 after
6485 } 6489 }
6486 #endif 6490 #endif
6487 6491
6488 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( 6492 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
6489 TransportDIB::Handle dib_handle) { 6493 TransportDIB::Handle dib_handle) {
6490 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6494 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6491 RenderProcess::current()->ReleaseTransportDIB(dib); 6495 RenderProcess::current()->ReleaseTransportDIB(dib);
6492 } 6496 }
6493 6497
6494 } // namespace content 6498 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698