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

Side by Side Diff: webkit/plugins/npapi/plugin_list.cc

Issue 10876083: [4] Changing content_settings_api to use PluginFinder's async interface (Closed) Base URL: http://git.chromium.org/chromium/src.git@async_start
Patch Set: Created 8 years, 3 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
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 "webkit/plugins/npapi/plugin_list.h" 5 #include "webkit/plugins/npapi/plugin_list.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 return true; 284 return true;
285 } 285 }
286 286
287 PluginList::PluginList() 287 PluginList::PluginList()
288 : loading_state_(LOADING_STATE_NEEDS_REFRESH) { 288 : loading_state_(LOADING_STATE_NEEDS_REFRESH) {
289 PlatformInit(); 289 PlatformInit();
290 AddHardcodedPluginGroups(kGroupDefinitions, 290 AddHardcodedPluginGroups(kGroupDefinitions,
291 ARRAYSIZE_UNSAFE(kGroupDefinitions)); 291 ARRAYSIZE_UNSAFE(kGroupDefinitions));
292 } 292 }
293 293
294 // TODO(ibraaaa): DELETE and add a different one. http://crbug.com/124396 294 PluginList::PluginList(int dummy)
295 :
296 #if defined(OS_WIN)
297 dont_load_new_wmp_(false),
298 #endif
299 loading_state_(LOADING_STATE_NEEDS_REFRESH) {
300 // Don't do platform-dependent initialization in unit tests.
301 }
302
303 // TODO(ibraaaa): DELETE. http://crbug.com/124396
295 PluginList::PluginList(const PluginGroupDefinition* definitions, 304 PluginList::PluginList(const PluginGroupDefinition* definitions,
296 size_t num_definitions) 305 size_t num_definitions)
297 : 306 :
298 #if defined(OS_WIN) 307 #if defined(OS_WIN)
299 dont_load_new_wmp_(false), 308 dont_load_new_wmp_(false),
300 #endif 309 #endif
301 loading_state_(LOADING_STATE_NEEDS_REFRESH) { 310 loading_state_(LOADING_STATE_NEEDS_REFRESH) {
302 // Don't do platform-dependent initialization in unit tests. 311 // Don't do platform-dependent initialization in unit tests.
303 AddHardcodedPluginGroups(definitions, num_definitions); 312 AddHardcodedPluginGroups(definitions, num_definitions);
304 } 313 }
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 } 716 }
708 return did_remove; 717 return did_remove;
709 } 718 }
710 719
711 PluginList::~PluginList() { 720 PluginList::~PluginList() {
712 } 721 }
713 722
714 723
715 } // namespace npapi 724 } // namespace npapi
716 } // namespace webkit 725 } // namespace webkit
OLDNEW
« webkit/plugins/npapi/plugin_list.h ('K') | « webkit/plugins/npapi/plugin_list.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698