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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 11615034: Remove unused Flash-related code: (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/common/chrome_paths.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index aa144cabe16644b0e21b0623fdc4123b50d5920d..321c2d6e774ea9177eae40242fde7fb3c93fa147 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -64,7 +64,6 @@
#include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_content_client.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
@@ -80,7 +79,6 @@
#include "content/public/browser/plugin_service.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/resource_dispatcher_host.h"
-#include "content/public/common/pepper_plugin_info.h"
#include "extensions/common/constants.h"
#include "net/socket/client_socket_pool_manager.h"
#include "net/url_request/url_request_context_getter.h"
@@ -792,25 +790,6 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance());
plugin_service->StartWatchingPlugins();
- // Register the internal Flash if available.
- FilePath path;
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableInternalFlash) &&
- PathService::Get(chrome::FILE_FLASH_PLUGIN_EXISTING, &path)) {
- plugin_service->AddExtraPluginPath(path);
- }
-
- // Register bundled Pepper Flash if available.
- content::PepperPluginInfo plugin;
- bool add_at_beginning = false;
- chrome::ChromeContentClient* content_client =
- static_cast<chrome::ChromeContentClient*>(content::GetContentClient());
- if (content_client->GetBundledFieldTrialPepperFlash(&plugin,
- &add_at_beginning)) {
- plugin_service->RegisterInternalPlugin(plugin.ToWebPluginInfo(),
- add_at_beginning);
- }
-
#if defined(OS_POSIX)
// Also find plugins in a user-specific plugins dir,
// e.g. ~/.config/chromium/Plugins.
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/common/chrome_paths.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698