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

Side by Side Diff: chrome/browser/plugin_updater.cc

Issue 7497030: PluginList cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix crash Created 9 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/plugin_updater.h" 5 #include "chrome/browser/plugin_updater.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 void PluginUpdater::UpdatePreferences(Profile* profile, int delay_ms) { 257 void PluginUpdater::UpdatePreferences(Profile* profile, int delay_ms) {
258 BrowserThread::PostDelayedTask( 258 BrowserThread::PostDelayedTask(
259 BrowserThread::FILE, 259 BrowserThread::FILE,
260 FROM_HERE, 260 FROM_HERE,
261 NewRunnableFunction( 261 NewRunnableFunction(
262 &PluginUpdater::GetPreferencesDataOnFileThread, profile), delay_ms); 262 &PluginUpdater::GetPreferencesDataOnFileThread, profile), delay_ms);
263 } 263 }
264 264
265 void PluginUpdater::GetPreferencesDataOnFileThread(void* profile) { 265 void PluginUpdater::GetPreferencesDataOnFileThread(void* profile) {
266 std::vector<webkit::npapi::WebPluginInfo> plugins; 266 std::vector<webkit::npapi::WebPluginInfo> plugins;
267 webkit::npapi::PluginList::Singleton()->GetPlugins(false, &plugins); 267 webkit::npapi::PluginList::Singleton()->GetPlugins(&plugins);
268 268
269 std::vector<webkit::npapi::PluginGroup> groups; 269 std::vector<webkit::npapi::PluginGroup> groups;
270 webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, &groups); 270 webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, &groups);
271 271
272 BrowserThread::PostTask( 272 BrowserThread::PostTask(
273 BrowserThread::UI, 273 BrowserThread::UI,
274 FROM_HERE, 274 FROM_HERE,
275 NewRunnableFunction(&PluginUpdater::OnUpdatePreferences, 275 NewRunnableFunction(&PluginUpdater::OnUpdatePreferences,
276 static_cast<Profile*>(profile), 276 static_cast<Profile*>(profile),
277 plugins, groups)); 277 plugins, groups));
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory, 346 prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,
347 internal_dir, 347 internal_dir,
348 PrefService::UNSYNCABLE_PREF); 348 PrefService::UNSYNCABLE_PREF);
349 prefs->RegisterListPref(prefs::kPluginsDisabledPlugins, 349 prefs->RegisterListPref(prefs::kPluginsDisabledPlugins,
350 PrefService::UNSYNCABLE_PREF); 350 PrefService::UNSYNCABLE_PREF);
351 prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions, 351 prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,
352 PrefService::UNSYNCABLE_PREF); 352 PrefService::UNSYNCABLE_PREF);
353 prefs->RegisterListPref(prefs::kPluginsEnabledPlugins, 353 prefs->RegisterListPref(prefs::kPluginsEnabledPlugins,
354 PrefService::UNSYNCABLE_PREF); 354 PrefService::UNSYNCABLE_PREF);
355 } 355 }
OLDNEW
« no previous file with comments | « chrome/browser/plugin_data_remover_helper.h ('k') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698