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

Unified Diff: chrome/plugin/chrome_content_plugin_client.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/common/chrome_content_client.cc ('k') | pdf/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/plugin/chrome_content_plugin_client.cc
diff --git a/chrome/plugin/chrome_content_plugin_client.cc b/chrome/plugin/chrome_content_plugin_client.cc
index e708bc699aa5d7f6c8f2219ead655d754c1ebbf7..80e23a911853904f8085f40e1c57fec3b8f40d29 100644
--- a/chrome/plugin/chrome_content_plugin_client.cc
+++ b/chrome/plugin/chrome_content_plugin_client.cc
@@ -4,19 +4,6 @@
#include "chrome/plugin/chrome_content_plugin_client.h"
-#if defined(ENABLE_REMOTING)
-#include "base/files/file_path.h"
-#include "base/path_service.h"
-#include "content/public/common/content_paths.h"
-#include "media/base/media.h"
-#if defined(OS_WIN)
-#include "base/logging.h"
-#include "base/native_library.h"
-#elif defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS_CERTS)
-#include "crypto/nss_util.h"
-#endif
-#endif
-
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
#include "gin/v8_initializer.h"
#endif
@@ -28,25 +15,6 @@ void ChromeContentPluginClient::PreSandboxInitialization() {
gin::V8Initializer::LoadV8Snapshot();
gin::V8Initializer::LoadV8Natives();
#endif
-
-#if defined(ENABLE_REMOTING)
-
- // Load crypto libraries for the Chromoting client plugin.
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS_CERTS)
- // On platforms where we use system NSS libraries, the .so's must be loaded
- // before the sandbox is initialized.
- crypto::InitNSSSafely();
-#elif defined(OS_WIN)
- // crypt32.dll is used to decode X509 certificates for Chromoting.
- base::NativeLibraryLoadError error;
- if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL)
- LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString();
-#endif // defined(OS_WIN)
-
- // Initialize media libraries for the Chromoting client plugin.
- media::InitializeMediaLibrary();
-
-#endif // defined(ENABLE_REMOTING)
}
} // namespace chrome
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | pdf/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698