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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 1271523003: Remove remoting client plugin from chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android and GN build Created 5 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/BUILD.gn ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 3121d64fb8035d55263f6ecfcfca349ce05f8e74..9da1155554bf4d0fb721680ccb60857912564797 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -116,10 +116,6 @@
#include "components/nacl/renderer/plugin/ppapi_entrypoints.h"
#endif
-#if defined(ENABLE_REMOTING)
-#include "remoting/client/plugin/pepper_entrypoints.h"
-#endif
-
#if defined(ENABLE_PLUGINS) && (defined(CHROME_MULTIPLE_DLL_CHILD) || \
!defined(CHROME_MULTIPLE_DLL_BROWSER))
#include "pdf/pdf.h"
@@ -818,12 +814,6 @@ void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
#endif
#if defined(CHROME_MULTIPLE_DLL_CHILD) || !defined(CHROME_MULTIPLE_DLL_BROWSER)
-#if defined(ENABLE_REMOTING)
- ChromeContentClient::SetRemotingEntryFunctions(
- remoting::PPP_GetInterface,
- remoting::PPP_InitializeModule,
- remoting::PPP_ShutdownModule);
-#endif
#if !defined(DISABLE_NACL)
ChromeContentClient::SetNaClEntryFunctions(
nacl_plugin::PPP_GetInterface,
« no previous file with comments | « chrome/app/BUILD.gn ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698