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

Side by Side Diff: content/browser/plugin_service_impl.cc

Issue 11090018: Only register the newer one of {bundled, component} Pepper Flash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/plugin_service_impl.h ('k') | content/public/browser/plugin_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser/plugin_service_impl.h" 5 #include "content/browser/plugin_service_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 base::Bind(&NotifyPluginsOfActivation)); 699 base::Bind(&NotifyPluginsOfActivation));
700 } 700 }
701 #endif 701 #endif
702 702
703 void PluginServiceImpl::RegisterInternalPlugin( 703 void PluginServiceImpl::RegisterInternalPlugin(
704 const webkit::WebPluginInfo& info, 704 const webkit::WebPluginInfo& info,
705 bool add_at_beginning) { 705 bool add_at_beginning) {
706 plugin_list_->RegisterInternalPlugin(info, add_at_beginning); 706 plugin_list_->RegisterInternalPlugin(info, add_at_beginning);
707 } 707 }
708 708
709 void PluginServiceImpl::GetInternalPlugins(
710 std::vector<webkit::WebPluginInfo>* plugins) {
711 plugin_list_->GetInternalPlugins(plugins);
712 }
713
709 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() { 714 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() {
710 return plugin_list_; 715 return plugin_list_;
711 } 716 }
OLDNEW
« no previous file with comments | « content/browser/plugin_service_impl.h ('k') | content/public/browser/plugin_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698