mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NPAPI has been removed, remove related option

Browse source
This commit is contained in:
Cheng Zhao 2015-09-05 01:52:29 +09:00
parent 0e92a3e333
commit 96771c7098
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/native_window.cc
View file

@ -424,7 +424,6 @@ void NativeWindow::OverrideWebkitPrefs(content::WebPreferences* prefs) {
return; return;
bool b; bool b;
std::vector<base::FilePath> list;
if (web_preferences_.Get("javascript", &b)) if (web_preferences_.Get("javascript", &b))
prefs->javascript_enabled = b; prefs->javascript_enabled = b;
if (web_preferences_.Get("images", &b)) if (web_preferences_.Get("images", &b))
@ -446,14 +445,6 @@ void NativeWindow::OverrideWebkitPrefs(content::WebPreferences* prefs) {
prefs->allow_displaying_insecure_content = b; prefs->allow_displaying_insecure_content = b;
if (web_preferences_.Get("allow-running-insecure-content", &b)) if (web_preferences_.Get("allow-running-insecure-content", &b))
prefs->allow_running_insecure_content = b; prefs->allow_running_insecure_content = b;
if (web_preferences_.Get("extra-plugin-dirs", &list)) {
if (content::PluginService::GetInstance()->NPAPIPluginsSupported()) {
for (size_t i = 0; i < list.size(); ++i)
content::PluginService::GetInstance()->AddExtraPluginDir(list[i]);
} else {
LOG(WARNING) << "NPAPI plugins not supported on this platform";
}
}
} }
void NativeWindow::NotifyWindowClosed() { void NativeWindow::NotifyWindowClosed() {

7
atom/browser/web_contents_preferences.cc
View file

@ -22,4 +22,11 @@ WebContentsPreferences::WebContentsPreferences(
WebContentsPreferences::~WebContentsPreferences() { WebContentsPreferences::~WebContentsPreferences() {
} }
// static
WebContentsPreferences* WebContentsPreferences::From(
content::WebContents* web_contents) {
return static_cast<WebContentsPreferences*>(
web_contents->GetUserData(kWebPreferencesKey));
}
} // namespace atom } // namespace atom

4
atom/browser/web_contents_preferences.h
View file

@ -10,9 +10,13 @@
namespace atom { namespace atom {
// Stores and applies the preferences of WebContents.
class WebContentsPreferences class WebContentsPreferences
: public content::WebContentsUserData<WebContentsPreferences> { : public content::WebContentsUserData<WebContentsPreferences> {
public: public:
// Get the preferences of |web_contents|.
static WebContentsPreferences* From(content::WebContents* web_contents);
WebContentsPreferences(content::WebContents* web_contents, WebContentsPreferences(content::WebContents* web_contents,
base::DictionaryValue&& web_preferences); base::DictionaryValue&& web_preferences);
~WebContentsPreferences() override; ~WebContentsPreferences() override;