| 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 "chrome/browser/plugins/chrome_plugin_service_filter.h" | 5 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, | 173 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, |
| 174 ui::PAGE_TRANSITION_LINK, false)); | 174 ui::PAGE_TRANSITION_LINK, false)); |
| 175 content::RecordAction(UserMetricsAction("NPAPIRemovalInfobar.LearnMore")); | 175 content::RecordAction(UserMetricsAction("NPAPIRemovalInfobar.LearnMore")); |
| 176 return true; | 176 return true; |
| 177 } | 177 } |
| 178 | 178 |
| 179 } // namespace | 179 } // namespace |
| 180 | 180 |
| 181 // static | 181 // static |
| 182 ChromePluginServiceFilter* ChromePluginServiceFilter::GetInstance() { | 182 ChromePluginServiceFilter* ChromePluginServiceFilter::GetInstance() { |
| 183 return Singleton<ChromePluginServiceFilter>::get(); | 183 return base::Singleton<ChromePluginServiceFilter>::get(); |
| 184 } | 184 } |
| 185 | 185 |
| 186 void ChromePluginServiceFilter::RegisterResourceContext( | 186 void ChromePluginServiceFilter::RegisterResourceContext( |
| 187 PluginPrefs* plugin_prefs, | 187 PluginPrefs* plugin_prefs, |
| 188 const void* context) { | 188 const void* context) { |
| 189 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 189 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 190 base::AutoLock lock(lock_); | 190 base::AutoLock lock(lock_); |
| 191 resource_context_map_[context] = plugin_prefs; | 191 resource_context_map_[context] = plugin_prefs; |
| 192 } | 192 } |
| 193 | 193 |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 | 450 |
| 451 ChromePluginServiceFilter::OverriddenPlugin::~OverriddenPlugin() { | 451 ChromePluginServiceFilter::OverriddenPlugin::~OverriddenPlugin() { |
| 452 } | 452 } |
| 453 | 453 |
| 454 ChromePluginServiceFilter::ProcessDetails::ProcessDetails() { | 454 ChromePluginServiceFilter::ProcessDetails::ProcessDetails() { |
| 455 } | 455 } |
| 456 | 456 |
| 457 ChromePluginServiceFilter::ProcessDetails::~ProcessDetails() { | 457 ChromePluginServiceFilter::ProcessDetails::~ProcessDetails() { |
| 458 } | 458 } |
| 459 | 459 |
| OLD | NEW |