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

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

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Whitespace fixes only. Trybot happiness still applies. Created 9 years, 11 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
« no previous file with comments | « webkit/plugins/npapi/plugin_lib_posix.cc ('k') | webkit/plugins/npapi/plugin_list.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "webkit/plugins/npapi/plugin_lib.h" 5 #include "webkit/plugins/npapi/plugin_lib.h"
6 6
7 #include "base/file_version_info.h" 7 #include "base/file_version_info.h"
8 #include "base/file_version_info_win.h" 8 #include "base/file_version_info_win.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 20 matching lines...) Expand all
31 return false; 31 return false;
32 } 32 }
33 33
34 FileVersionInfoWin* version_info_win = 34 FileVersionInfoWin* version_info_win =
35 static_cast<FileVersionInfoWin*>(version_info.get()); 35 static_cast<FileVersionInfoWin*>(version_info.get());
36 36
37 info->name = version_info->product_name(); 37 info->name = version_info->product_name();
38 info->desc = version_info->file_description(); 38 info->desc = version_info->file_description();
39 info->version = version_info->file_version(); 39 info->version = version_info->file_version();
40 info->path = filename; 40 info->path = filename;
41 info->enabled = true; 41 info->enabled = WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
42 42
43 // TODO(evan): Move the ParseMimeTypes code inline once Pepper is updated. 43 // TODO(evan): Move the ParseMimeTypes code inline once Pepper is updated.
44 if (!PluginList::ParseMimeTypes( 44 if (!PluginList::ParseMimeTypes(
45 UTF16ToASCII(version_info_win->GetStringValue(L"MIMEType")), 45 UTF16ToASCII(version_info_win->GetStringValue(L"MIMEType")),
46 UTF16ToASCII(version_info_win->GetStringValue(L"FileExtents")), 46 UTF16ToASCII(version_info_win->GetStringValue(L"FileExtents")),
47 version_info_win->GetStringValue(L"FileOpenName"), 47 version_info_win->GetStringValue(L"FileOpenName"),
48 &info->mime_types)) { 48 &info->mime_types)) {
49 LOG_IF(ERROR, PluginList::DebugPluginLoading()) 49 LOG_IF(ERROR, PluginList::DebugPluginLoading())
50 << "Plugin " << info->name << " has bad MIME types, skipping"; 50 << "Plugin " << info->name << " has bad MIME types, skipping";
51 return false; 51 return false;
52 } 52 }
53 53
54 return true; 54 return true;
55 } 55 }
56 56
57 } // namespace npapi 57 } // namespace npapi
58 } // namespace webkit 58 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/plugin_lib_posix.cc ('k') | webkit/plugins/npapi/plugin_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698