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

No need to add new methods to WebContentsPreferences

Browse source
This commit is contained in:
Cheng Zhao 2017-11-13 17:35:49 +09:00
parent cee1c459c7
commit 72440d4ae7
3 changed files with 19 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

25
atom/browser/native_window_views.cc
View file

@ -11,6 +11,7 @@
#include "atom/browser/native_browser_view_views.h" #include "atom/browser/native_browser_view_views.h"
#include "atom/browser/ui/views/menu_bar.h" #include "atom/browser/ui/views/menu_bar.h"
#include "atom/browser/web_contents_preferences.h" #include "atom/browser/web_contents_preferences.h"
#include "atom/browser/web_view_manager.h"
#include "atom/browser/window_list.h" #include "atom/browser/window_list.h"
#include "atom/common/color_util.h" #include "atom/common/color_util.h"
#include "atom/common/draggable_region.h" #include "atom/common/draggable_region.h"
@ -1362,13 +1363,25 @@ void NativeWindowViews::ShowAutofillPopup(
const gfx::RectF& bounds, const gfx::RectF& bounds,
const std::vector<base::string16>& values, const std::vector<base::string16>& values,
const std::vector<base::string16>& labels) { const std::vector<base::string16>& labels) {
WebContentsPreferences* web_preferences = const auto* web_preferences =
WebContentsPreferences::FromWebContents(web_contents); WebContentsPreferences::FromWebContents(web_contents)->web_preferences();
bool is_offsceen = web_preferences->IsOffScreen(web_contents); bool is_offsceen = false;
bool is_embedder_offscreen = web_preferences->GetBoolean("offscreen", &is_offsceen);
web_preferences->IsGuest(web_contents) && int guest_instance_id = 0;
web_preferences->IsOffScreen(web_preferences->Embedder(web_contents)); web_preferences->GetInteger(options::kGuestInstanceID, &guest_instance_id);
bool is_embedder_offscreen = false;
if (guest_instance_id) {
auto manager = WebViewManager::GetWebViewManager(web_contents);
if (manager) {
auto embedder = manager->GetEmbedder(guest_instance_id);
if (embedder) {
is_embedder_offscreen = WebContentsPreferences::IsPreferenceEnabled(
"offscreen", embedder);
}
}
}
autofill_popup_->CreateView( autofill_popup_->CreateView(
frame_host, frame_host,

46
atom/browser/web_contents_preferences.cc
View file

@ -239,52 +239,6 @@ bool WebContentsPreferences::IsPluginsEnabled(
return IsPreferenceEnabled("plugins", web_contents); return IsPreferenceEnabled("plugins", web_contents);
} }
bool WebContentsPreferences::IsOffScreen(
content::WebContents* web_contents) {
return IsPreferenceEnabled("offscreen", web_contents);
}
bool WebContentsPreferences::IsGuest(
content::WebContents* web_contents) {
WebContentsPreferences* self;
if (!web_contents)
return false;
self = FromWebContents(web_contents);
if (!self)
return false;
base::DictionaryValue& web_preferences = self->web_preferences_;
int guest_instance_id = 0;
return web_preferences.GetInteger(
options::kGuestInstanceID, &guest_instance_id);
}
content::WebContents* WebContentsPreferences::Embedder(
content::WebContents* web_contents) {
WebContentsPreferences* self;
if (!web_contents)
return nullptr;
self = FromWebContents(web_contents);
if (!self)
return nullptr;
base::DictionaryValue& web_preferences = self->web_preferences_;
int g_instance_id = 0;
if (web_preferences.GetInteger(options::kGuestInstanceID, &g_instance_id)) {
auto manager = WebViewManager::GetWebViewManager(web_contents);
if (manager) {
auto embedder = manager->GetEmbedder(g_instance_id);
if (embedder) {
return embedder;
}
}
}
return nullptr;
}
bool WebContentsPreferences::DisablePopups( bool WebContentsPreferences::DisablePopups(
content::WebContents* web_contents) { content::WebContents* web_contents) {
return IsPreferenceEnabled("disablePopups", web_contents); return IsPreferenceEnabled("disablePopups", web_contents);

3
atom/browser/web_contents_preferences.h
View file

@ -43,9 +43,6 @@ class WebContentsPreferences
static bool UsesNativeWindowOpen(content::WebContents* web_contents); static bool UsesNativeWindowOpen(content::WebContents* web_contents);
static bool DisablePopups(content::WebContents* web_contents); static bool DisablePopups(content::WebContents* web_contents);
static bool IsPluginsEnabled(content::WebContents* web_contents); static bool IsPluginsEnabled(content::WebContents* web_contents);
static bool IsOffScreen(content::WebContents* web_contents);
static bool IsGuest(content::WebContents* web_contents);
static content::WebContents* Embedder(content::WebContents* web_contents);
// Modify the WebPreferences according to |web_contents|'s preferences. // Modify the WebPreferences according to |web_contents|'s preferences.
static void OverrideWebkitPrefs( static void OverrideWebkitPrefs(