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

Side by Side Diff: webkit/glue/plugins/plugin_list_win.cc

Issue 210004: Fix the deadlock when Flash tries to make WMP full screen. This is a one-off... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 <tchar.h> 5 #include <tchar.h>
6 6
7 #include "webkit/glue/plugins/plugin_list.h" 7 #include "webkit/glue/plugins/plugin_list.h"
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/registry.h" 12 #include "base/registry.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "webkit/glue/plugins/plugin_constants_win.h" 14 #include "webkit/glue/plugins/plugin_constants_win.h"
15 #include "webkit/glue/plugins/plugin_lib.h" 15 #include "webkit/glue/plugins/plugin_lib.h"
16 #include "webkit/glue/webkit_glue.h" 16 #include "webkit/glue/webkit_glue.h"
17 17
18 namespace { 18 namespace {
19 19
20 const TCHAR kRegistryApps[] = 20 const TCHAR kRegistryApps[] =
21 _T("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths"); 21 _T("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths");
22 const TCHAR kRegistryFirefox[] = _T("firefox.exe"); 22 const TCHAR kRegistryFirefox[] = _T("firefox.exe");
23 const TCHAR kRegistryAcrobat[] = _T("Acrobat.exe"); 23 const TCHAR kRegistryAcrobat[] = _T("Acrobat.exe");
24 const TCHAR kRegistryAcrobatReader[] = _T("AcroRd32.exe"); 24 const TCHAR kRegistryAcrobatReader[] = _T("AcroRd32.exe");
25 const TCHAR kRegistryWindowsMedia[] = _T("wmplayer.exe"); 25 const TCHAR kRegistryWindowsMedia[] = _T("wmplayer.exe");
26 const TCHAR kRegistryQuickTime[] = _T("QuickTimePlayer.exe"); 26 const TCHAR kRegistryQuickTime[] = _T("QuickTimePlayer.exe");
27 const TCHAR kRegistryPath[] = _T("Path"); 27 const TCHAR kRegistryPath[] = _T("Path");
28 const TCHAR kRegistryFirefoxInstalled[] = 28 const TCHAR kRegistryFirefoxInstalled[] =
29 _T("SOFTWARE\\Mozilla\\Mozilla Firefox"); 29 _T("SOFTWARE\\Mozilla\\Mozilla Firefox");
30 const TCHAR kMozillaActiveXPlugin[] = _T("npmozax.dll");
31 const TCHAR kNewWMPPlugin[] = _T("np-mswmp.dll");
32 const TCHAR kOldWMPPlugin[] = _T("npdsplay.dll");
33 const TCHAR kYahooApplicationStatePlugin[] = _T("npystate.dll");
34 const TCHAR kWanWangProtocolHandlerPlugin[] = _T("npww.dll");
35 const TCHAR kRegistryJava[] = 30 const TCHAR kRegistryJava[] =
36 _T("Software\\JavaSoft\\Java Runtime Environment"); 31 _T("Software\\JavaSoft\\Java Runtime Environment");
37 const TCHAR kRegistryBrowserJavaVersion[] = _T("BrowserJavaVersion"); 32 const TCHAR kRegistryBrowserJavaVersion[] = _T("BrowserJavaVersion");
38 const TCHAR kRegistryCurrentJavaVersion[] = _T("CurrentVersion"); 33 const TCHAR kRegistryCurrentJavaVersion[] = _T("CurrentVersion");
39 const TCHAR kRegistryJavaHome[] = _T("JavaHome"); 34 const TCHAR kRegistryJavaHome[] = _T("JavaHome");
40 35
41 // The application path where we expect to find plugins. 36 // The application path where we expect to find plugins.
42 void GetAppDirectory(std::set<FilePath>* plugin_dirs) { 37 void GetAppDirectory(std::set<FilePath>* plugin_dirs) {
43 FilePath app_path; 38 FilePath app_path;
44 if (!webkit_glue::GetApplicationDirectory(&app_path)) 39 if (!webkit_glue::GetApplicationDirectory(&app_path))
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 for (size_t i = 0; i < plugins->size(); ++i) { 310 for (size_t i = 0; i < plugins->size(); ++i) {
316 if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin) 311 if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
317 return false; 312 return false;
318 } 313 }
319 } 314 }
320 315
321 return true; 316 return true;
322 } 317 }
323 318
324 } // namespace NPAPI 319 } // namespace NPAPI
OLDNEW
« no previous file with comments | « webkit/glue/plugins/plugin_constants_win.h ('k') | webkit/glue/plugins/webplugin_delegate_impl_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698