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

Side by Side Diff: webkit/support/webkit_support.cc

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unit tests. 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
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/support/webkit_support.h" 5 #include "webkit/support/webkit_support.h"
6 6
7 #include "app/gfx/gl/gl_implementation.h" 7 #include "app/gfx/gl/gl_implementation.h"
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 return test_environment->webkit_client(); 248 return test_environment->webkit_client();
249 } 249 }
250 250
251 WebPlugin* CreateWebPlugin(WebFrame* frame, 251 WebPlugin* CreateWebPlugin(WebFrame* frame,
252 const WebPluginParams& params) { 252 const WebPluginParams& params) {
253 const bool kAllowWildcard = true; 253 const bool kAllowWildcard = true;
254 webkit::npapi::WebPluginInfo info; 254 webkit::npapi::WebPluginInfo info;
255 std::string actual_mime_type; 255 std::string actual_mime_type;
256 if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo( 256 if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo(
257 params.url, params.mimeType.utf8(), kAllowWildcard, &info, 257 params.url, params.mimeType.utf8(), kAllowWildcard, &info,
258 &actual_mime_type) || !info.enabled) { 258 &actual_mime_type) || !webkit::npapi::IsPluginEnabled(info)) {
259 return NULL; 259 return NULL;
260 } 260 }
261 261
262 return new WebPluginImplWithPageDelegate( 262 return new WebPluginImplWithPageDelegate(
263 frame, params, info.path, actual_mime_type); 263 frame, params, info.path, actual_mime_type);
264 } 264 }
265 265
266 WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame, 266 WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame,
267 WebMediaPlayerClient* client) { 267 WebMediaPlayerClient* client) {
268 scoped_ptr<media::FilterCollection> collection( 268 scoped_ptr<media::FilterCollection> collection(
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 525
526 // FileSystem 526 // FileSystem
527 void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type, 527 void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type,
528 long long size, bool create, WebFileSystemCallbacks* callbacks) { 528 long long size, bool create, WebFileSystemCallbacks* callbacks) {
529 SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>( 529 SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
530 test_environment->webkit_client()->fileSystem()); 530 test_environment->webkit_client()->fileSystem());
531 fileSystem->OpenFileSystem(frame, type, size, create, callbacks); 531 fileSystem->OpenFileSystem(frame, type, size, create, callbacks);
532 } 532 }
533 533
534 } // namespace webkit_support 534 } // namespace webkit_support
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698