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

Dicard uses of base::Value in native_window.

Browse source
This commit is contained in:
Cheng Zhao 2014-06-23 22:08:40 +08:00
parent 84e2c35611
commit b92e6e97ea
2 changed files with 18 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

40
atom/browser/native_window.cc
View file

@ -16,7 +16,7 @@
#include "atom/browser/window_list.h" #include "atom/browser/window_list.h"
#include "atom/common/api/api_messages.h" #include "atom/common/api/api_messages.h"
#include "atom/common/atom_version.h" #include "atom/common/atom_version.h"
#include "atom/common/native_mate_converters/value_converter.h" #include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/options_switches.h" #include "atom/common/options_switches.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/file_util.h" #include "base/file_util.h"
@ -26,7 +26,6 @@
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/invalidate_type.h" #include "content/public/browser/invalidate_type.h"
#include "content/public/browser/navigation_entry.h" #include "content/public/browser/navigation_entry.h"
@ -82,9 +81,9 @@ NativeWindow::NativeWindow(content::WebContents* web_contents,
options.Get(switches::kNodeIntegration, &node_integration_); options.Get(switches::kNodeIntegration, &node_integration_);
// Read the web preferences. // Read the web preferences.
base::DictionaryValue web_preferences; scoped_ptr<mate::Dictionary> web_preferences(new mate::Dictionary);
if (options.Get(switches::kWebPreferences, &web_preferences)) if (options.Get(switches::kWebPreferences, web_preferences.get()))
web_preferences_.reset(web_preferences.DeepCopy()); web_preferences_.reset(web_preferences.release());
// Read the zoom factor before any navigation. // Read the zoom factor before any navigation.
options.Get(switches::kZoomFactor, &zoom_factor_); options.Get(switches::kZoomFactor, &zoom_factor_);
@ -377,35 +376,30 @@ void NativeWindow::OverrideWebkitPrefs(const GURL& url, WebPreferences* prefs) {
prefs->accelerated_compositing_enabled = false; prefs->accelerated_compositing_enabled = false;
bool b; bool b;
base::ListValue* list; std::vector<base::FilePath> list;
if (!web_preferences_) if (!web_preferences_)
return; return;
if (web_preferences_->GetBoolean("javascript", &b)) if (web_preferences_->Get("javascript", &b))
prefs->javascript_enabled = b; prefs->javascript_enabled = b;
if (web_preferences_->GetBoolean("web-security", &b)) if (web_preferences_->Get("web-security", &b))
prefs->web_security_enabled = b; prefs->web_security_enabled = b;
if (web_preferences_->GetBoolean("images", &b)) if (web_preferences_->Get("images", &b))
prefs->images_enabled = b; prefs->images_enabled = b;
if (web_preferences_->GetBoolean("java", &b)) if (web_preferences_->Get("java", &b))
prefs->java_enabled = b; prefs->java_enabled = b;
if (web_preferences_->GetBoolean("text-areas-are-resizable", &b)) if (web_preferences_->Get("text-areas-are-resizable", &b))
prefs->text_areas_are_resizable = b; prefs->text_areas_are_resizable = b;
if (web_preferences_->GetBoolean("webgl", &b)) if (web_preferences_->Get("webgl", &b))
prefs->experimental_webgl_enabled = b; prefs->experimental_webgl_enabled = b;
if (web_preferences_->GetBoolean("webaudio", &b)) if (web_preferences_->Get("webaudio", &b))
prefs->webaudio_enabled = b; prefs->webaudio_enabled = b;
if (web_preferences_->GetBoolean("accelerated-compositing", &b)) if (web_preferences_->Get("accelerated-compositing", &b))
prefs->accelerated_compositing_enabled = b; prefs->accelerated_compositing_enabled = b;
if (web_preferences_->GetBoolean("plugins", &b)) if (web_preferences_->Get("plugins", &b))
prefs->plugins_enabled = b; prefs->plugins_enabled = b;
if (web_preferences_->GetList("extra-plugin-dirs", &list)) if (web_preferences_->Get("extra-plugin-dirs", &list))
for (size_t i = 0; i < list->GetSize(); ++i) { for (size_t i = 0; i < list.size(); ++i)
base::FilePath::StringType path_string; content::PluginService::GetInstance()->AddExtraPluginDir(list[i]);
if (list->GetString(i, &path_string)) {
base::FilePath path(path_string);
content::PluginService::GetInstance()->AddExtraPluginDir(path);
}
}
} }
void NativeWindow::NotifyWindowClosed() { void NativeWindow::NotifyWindowClosed() {

7
atom/browser/native_window.h
View file

@ -26,11 +26,6 @@
class CommandLine; class CommandLine;
struct WebPreferences; struct WebPreferences;
namespace base {
class DictionaryValue;
class ListValue;
}
namespace content { namespace content {
class BrowserContext; class BrowserContext;
class WebContents; class WebContents;
@ -296,7 +291,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
base::CancelableClosure window_unresposive_closure_; base::CancelableClosure window_unresposive_closure_;
// Web preferences. // Web preferences.
scoped_ptr<base::DictionaryValue> web_preferences_; scoped_ptr<mate::Dictionary> web_preferences_;
// Page's default zoom factor. // Page's default zoom factor.
double zoom_factor_; double zoom_factor_;