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

Side by Side Diff: Source/modules/plugins/NavigatorPlugins.cpp

Issue 1306403003: Remove javaEnabled setting. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "config.h" 5 #include "config.h"
6 #include "modules/plugins/NavigatorPlugins.h" 6 #include "modules/plugins/NavigatorPlugins.h"
7 7
8 #include "core/frame/LocalFrame.h" 8 #include "core/frame/LocalFrame.h"
9 #include "core/frame/Navigator.h" 9 #include "core/frame/Navigator.h"
10 #include "core/frame/Settings.h" 10 #include "core/frame/Settings.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 // static 54 // static
55 DOMMimeTypeArray* NavigatorPlugins::mimeTypes(Navigator& navigator) 55 DOMMimeTypeArray* NavigatorPlugins::mimeTypes(Navigator& navigator)
56 { 56 {
57 return NavigatorPlugins::from(navigator).mimeTypes(navigator.frame()); 57 return NavigatorPlugins::from(navigator).mimeTypes(navigator.frame());
58 } 58 }
59 59
60 // static 60 // static
61 bool NavigatorPlugins::javaEnabled(Navigator& navigator) 61 bool NavigatorPlugins::javaEnabled(Navigator& navigator)
62 { 62 {
63 return NavigatorPlugins::from(navigator).javaEnabled(navigator.frame()); 63 return false;
64 } 64 }
65 65
66 DOMPluginArray* NavigatorPlugins::plugins(LocalFrame* frame) const 66 DOMPluginArray* NavigatorPlugins::plugins(LocalFrame* frame) const
67 { 67 {
68 if (!m_plugins) 68 if (!m_plugins)
69 m_plugins = DOMPluginArray::create(frame); 69 m_plugins = DOMPluginArray::create(frame);
70 return m_plugins.get(); 70 return m_plugins.get();
71 } 71 }
72 72
73 DOMMimeTypeArray* NavigatorPlugins::mimeTypes(LocalFrame* frame) const 73 DOMMimeTypeArray* NavigatorPlugins::mimeTypes(LocalFrame* frame) const
74 { 74 {
75 if (!m_mimeTypes) 75 if (!m_mimeTypes)
76 m_mimeTypes = DOMMimeTypeArray::create(frame); 76 m_mimeTypes = DOMMimeTypeArray::create(frame);
77 return m_mimeTypes.get(); 77 return m_mimeTypes.get();
78 } 78 }
79 79
80 bool NavigatorPlugins::javaEnabled(LocalFrame* frame) const
81 {
82 if (!frame || !frame->settings())
83 return false;
84
85 return frame->settings()->javaEnabled();
86 }
87
88 DEFINE_TRACE(NavigatorPlugins) 80 DEFINE_TRACE(NavigatorPlugins)
89 { 81 {
90 visitor->trace(m_plugins); 82 visitor->trace(m_plugins);
91 visitor->trace(m_mimeTypes); 83 visitor->trace(m_mimeTypes);
92 HeapSupplement<Navigator>::trace(visitor); 84 HeapSupplement<Navigator>::trace(visitor);
93 DOMWindowProperty::trace(visitor); 85 DOMWindowProperty::trace(visitor);
94 } 86 }
95 87
96 } // namespace blink 88 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698