| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/dom_ui/plugins_ui.h" | 5 #include "chrome/browser/dom_ui/plugins_ui.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 // JavaScript). | 207 // JavaScript). |
| 208 if (args->GetSize() != 3) | 208 if (args->GetSize() != 3) |
| 209 return; | 209 return; |
| 210 | 210 |
| 211 std::string enable_str; | 211 std::string enable_str; |
| 212 std::string is_group_str; | 212 std::string is_group_str; |
| 213 if (!args->GetString(1, &enable_str) || !args->GetString(2, &is_group_str)) | 213 if (!args->GetString(1, &enable_str) || !args->GetString(2, &is_group_str)) |
| 214 return; | 214 return; |
| 215 bool enable = enable_str == "true"; | 215 bool enable = enable_str == "true"; |
| 216 | 216 |
| 217 PluginUpdater* plugin_updater = PluginUpdater::GetPluginUpdater(); | 217 PluginUpdater* plugin_updater = PluginUpdater::GetInstance(); |
| 218 if (is_group_str == "true") { | 218 if (is_group_str == "true") { |
| 219 string16 group_name; | 219 string16 group_name; |
| 220 if (!args->GetString(0, &group_name)) | 220 if (!args->GetString(0, &group_name)) |
| 221 return; | 221 return; |
| 222 | 222 |
| 223 plugin_updater->EnablePluginGroup(enable, group_name); | 223 plugin_updater->EnablePluginGroup(enable, group_name); |
| 224 if (enable) { | 224 if (enable) { |
| 225 // See http://crbug.com/50105 for background. | 225 // See http://crbug.com/50105 for background. |
| 226 string16 adobereader = ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName); | 226 string16 adobereader = ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName); |
| 227 string16 internalpdf = ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName); | 227 string16 internalpdf = ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 255 | 255 |
| 256 void PluginsDOMHandler::Observe(NotificationType type, | 256 void PluginsDOMHandler::Observe(NotificationType type, |
| 257 const NotificationSource& source, | 257 const NotificationSource& source, |
| 258 const NotificationDetails& details) { | 258 const NotificationDetails& details) { |
| 259 DCHECK_EQ(NotificationType::PLUGIN_ENABLE_STATUS_CHANGED, type.value); | 259 DCHECK_EQ(NotificationType::PLUGIN_ENABLE_STATUS_CHANGED, type.value); |
| 260 LoadPlugins(); | 260 LoadPlugins(); |
| 261 } | 261 } |
| 262 | 262 |
| 263 void PluginsDOMHandler::LoadPluginsOnFileThread(ListWrapper* wrapper, | 263 void PluginsDOMHandler::LoadPluginsOnFileThread(ListWrapper* wrapper, |
| 264 Task* task) { | 264 Task* task) { |
| 265 wrapper->list = PluginUpdater::GetPluginUpdater()->GetPluginGroupsData(); | 265 wrapper->list = PluginUpdater::GetInstance()->GetPluginGroupsData(); |
| 266 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, task); | 266 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, task); |
| 267 BrowserThread::PostTask( | 267 BrowserThread::PostTask( |
| 268 BrowserThread::UI, | 268 BrowserThread::UI, |
| 269 FROM_HERE, | 269 FROM_HERE, |
| 270 NewRunnableFunction(&PluginsDOMHandler::EnsureListDeleted, wrapper)); | 270 NewRunnableFunction(&PluginsDOMHandler::EnsureListDeleted, wrapper)); |
| 271 } | 271 } |
| 272 | 272 |
| 273 void PluginsDOMHandler::EnsureListDeleted(ListWrapper* wrapper) { | 273 void PluginsDOMHandler::EnsureListDeleted(ListWrapper* wrapper) { |
| 274 delete wrapper->list; | 274 delete wrapper->list; |
| 275 delete wrapper; | 275 delete wrapper; |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 void PluginsUI::RegisterUserPrefs(PrefService* prefs) { | 330 void PluginsUI::RegisterUserPrefs(PrefService* prefs) { |
| 331 FilePath internal_dir; | 331 FilePath internal_dir; |
| 332 PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir); | 332 PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir); |
| 333 prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory, | 333 prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory, |
| 334 internal_dir); | 334 internal_dir); |
| 335 | 335 |
| 336 prefs->RegisterListPref(prefs::kPluginsPluginsBlacklist); | 336 prefs->RegisterListPref(prefs::kPluginsPluginsBlacklist); |
| 337 prefs->RegisterListPref(prefs::kPluginsPluginsList); | 337 prefs->RegisterListPref(prefs::kPluginsPluginsList); |
| 338 prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF, false); | 338 prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF, false); |
| 339 } | 339 } |
| OLD | NEW |