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

Pending renderer process no longer has render view attached

Browse source
This commit is contained in:
Cheng Zhao 2016-03-09 21:34:51 +09:00
parent 6de9c4332f
commit bfc6d77bb3
3 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/web_contents_preferences.h
View file

@ -5,6 +5,8 @@
#ifndef ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_
#define ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_
#include <vector>
#include "base/values.h"
#include "content/public/browser/web_contents_user_data.h"
@ -26,6 +28,9 @@ namespace atom {
class WebContentsPreferences
: public content::WebContentsUserData<WebContentsPreferences> {
public:
// Get WebContents according to process ID.
static content::WebContents* GetWebContentsFromProcessID(int process_id);
// Append command paramters according to |web_contents|'s preferences.
static void AppendExtraCommandLineSwitches(
content::WebContents* web_contents, base::CommandLine* command_line);
@ -47,6 +52,9 @@ class WebContentsPreferences
private:
friend class content::WebContentsUserData<WebContentsPreferences>;
static std::vector<WebContentsPreferences*> instances_;
content::WebContents* web_contents_;
base::DictionaryValue web_preferences_;
DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);