| OLD | NEW |
| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 BrowserThread::UI, FROM_HERE, | 89 BrowserThread::UI, FROM_HERE, |
| 90 base::Bind(&content::PluginService::PurgePluginListCache, | 90 base::Bind(&content::PluginService::PurgePluginListCache, |
| 91 static_cast<content::BrowserContext*>(NULL), false)); | 91 static_cast<content::BrowserContext*>(NULL), false)); |
| 92 } | 92 } |
| 93 | 93 |
| 94 virtual void OnFilePathError(const FilePath& path) OVERRIDE { | 94 virtual void OnFilePathError(const FilePath& path) OVERRIDE { |
| 95 // TODO(pastarmovj): Add some sensible error handling. Maybe silently | 95 // TODO(pastarmovj): Add some sensible error handling. Maybe silently |
| 96 // stopping the watcher would be enough. Or possibly restart it. | 96 // stopping the watcher would be enough. Or possibly restart it. |
| 97 NOTREACHED(); | 97 NOTREACHED(); |
| 98 } | 98 } |
| 99 |
| 100 protected: |
| 101 virtual ~PluginDirWatcherDelegate() {} |
| 99 }; | 102 }; |
| 100 #endif | 103 #endif |
| 101 | 104 |
| 102 namespace content { | 105 namespace content { |
| 103 // static | 106 // static |
| 104 PluginService* PluginService::GetInstance() { | 107 PluginService* PluginService::GetInstance() { |
| 105 return PluginServiceImpl::GetInstance(); | 108 return PluginServiceImpl::GetInstance(); |
| 106 } | 109 } |
| 107 | 110 |
| 108 void PluginService::PurgePluginListCache(BrowserContext* browser_context, | 111 void PluginService::PurgePluginListCache(BrowserContext* browser_context, |
| (...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 plugin_list_->RegisterInternalPlugin(info, add_at_beginning); | 712 plugin_list_->RegisterInternalPlugin(info, add_at_beginning); |
| 710 } | 713 } |
| 711 | 714 |
| 712 string16 PluginServiceImpl::GetPluginGroupName(const std::string& plugin_name) { | 715 string16 PluginServiceImpl::GetPluginGroupName(const std::string& plugin_name) { |
| 713 return plugin_list_->GetPluginGroupName(plugin_name); | 716 return plugin_list_->GetPluginGroupName(plugin_name); |
| 714 } | 717 } |
| 715 | 718 |
| 716 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() { | 719 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() { |
| 717 return plugin_list_; | 720 return plugin_list_; |
| 718 } | 721 } |
| OLD | NEW |