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

Update to new Chromium APIs.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-28 15:29:51 +08:00
parent 5ad203ad99
commit 7a89a08534
18 changed files with 28 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/native_window.cc
View file

@ -38,7 +38,6 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/common/renderer_preferences.h"
#include "content/public/common/user_agent.h"
#include "ipc/ipc_message_macros.h"
@ -305,7 +304,7 @@ void NativeWindow::CloseWebContents() {
ScheduleUnresponsiveEvent(5000);
if (web_contents->NeedToFireBeforeUnload())
web_contents->GetMainFrame()->DispatchBeforeUnload(false);
web_contents->DispatchBeforeUnload(false);
else
web_contents->Close();
}
@ -356,8 +355,6 @@ void NativeWindow::OverrideWebkitPrefs(const GURL& url, WebPreferences* prefs) {
prefs->experimental_webgl_enabled = b;
if (web_preferences.Get("webaudio", &b))
prefs->webaudio_enabled = b;
if (web_preferences.Get("accelerated-compositing", &b))
prefs->accelerated_compositing_enabled = b;
if (web_preferences.Get("plugins", &b))
prefs->plugins_enabled = b;
if (web_preferences.Get("extra-plugin-dirs", &list))