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

Store NativeWindow in weak ptr

Browse source
This commit is contained in:
Cheng Zhao 2015-06-24 22:29:44 +08:00
parent 19ca011735
commit 4b61683cdf
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/common_web_contents_delegate.cc
View file

@ -108,8 +108,7 @@ void AppendToFile(const base::FilePath& path,
} // namespace } // namespace
CommonWebContentsDelegate::CommonWebContentsDelegate() CommonWebContentsDelegate::CommonWebContentsDelegate()
: owner_window_(nullptr), : html_fullscreen_(false),
html_fullscreen_(false),
native_fullscreen_(false) { native_fullscreen_(false) {
} }
@ -119,10 +118,10 @@ CommonWebContentsDelegate::~CommonWebContentsDelegate() {
void CommonWebContentsDelegate::InitWithWebContents( void CommonWebContentsDelegate::InitWithWebContents(
content::WebContents* web_contents, content::WebContents* web_contents,
NativeWindow* owner_window) { NativeWindow* owner_window) {
owner_window_ = owner_window; owner_window_ = owner_window->GetWeakPtr();
web_contents->SetDelegate(this); web_contents->SetDelegate(this);
NativeWindowRelay* relay = new NativeWindowRelay(owner_window_->GetWeakPtr()); NativeWindowRelay* relay = new NativeWindowRelay(owner_window_);
web_contents->SetUserData(relay->key, relay); web_contents->SetUserData(relay->key, relay);
printing::PrintViewManagerBasic::CreateForWebContents(web_contents); printing::PrintViewManagerBasic::CreateForWebContents(web_contents);
@ -199,7 +198,7 @@ void CommonWebContentsDelegate::RunFileChooser(
content::WebContents* guest, content::WebContents* guest,
const content::FileChooserParams& params) { const content::FileChooserParams& params) {
if (!web_dialog_helper_) if (!web_dialog_helper_)
web_dialog_helper_.reset(new WebDialogHelper(owner_window_)); web_dialog_helper_.reset(new WebDialogHelper(owner_window()));
web_dialog_helper_->RunFileChooser(guest, params); web_dialog_helper_->RunFileChooser(guest, params);
} }
@ -207,7 +206,7 @@ void CommonWebContentsDelegate::EnumerateDirectory(content::WebContents* guest,
int request_id, int request_id,
const base::FilePath& path) { const base::FilePath& path) {
if (!web_dialog_helper_) if (!web_dialog_helper_)
web_dialog_helper_.reset(new WebDialogHelper(owner_window_)); web_dialog_helper_.reset(new WebDialogHelper(owner_window()));
web_dialog_helper_->EnumerateDirectory(guest, request_id, path); web_dialog_helper_->EnumerateDirectory(guest, request_id, path);
} }
@ -243,7 +242,7 @@ void CommonWebContentsDelegate::DevToolsSaveToFile(
} else { } else {
file_dialog::Filters filters; file_dialog::Filters filters;
base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url)); base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url));
if (!file_dialog::ShowSaveDialog(owner_window_, url, default_path, if (!file_dialog::ShowSaveDialog(owner_window(), url, default_path,
filters, &path)) { filters, &path)) {
base::StringValue url_value(url); base::StringValue url_value(url);
web_contents_->CallClientFunction( web_contents_->CallClientFunction(
@ -278,7 +277,7 @@ void CommonWebContentsDelegate::DevToolsAddFileSystem() {
base::FilePath default_path; base::FilePath default_path;
std::vector<base::FilePath> paths; std::vector<base::FilePath> paths;
int flag = file_dialog::FILE_DIALOG_OPEN_DIRECTORY; int flag = file_dialog::FILE_DIALOG_OPEN_DIRECTORY;
if (!file_dialog::ShowOpenDialog(owner_window_, "", default_path, if (!file_dialog::ShowOpenDialog(owner_window(), "", default_path,
filters, flag, &paths)) filters, flag, &paths))
return; return;

4
atom/browser/common_web_contents_delegate.h
View file

@ -44,6 +44,8 @@ class CommonWebContentsDelegate
return web_contents_.get(); return web_contents_.get();
} }
NativeWindow* owner_window() const { return owner_window_.get(); }
protected: protected:
// content::WebContentsDelegate: // content::WebContentsDelegate:
content::WebContents* OpenURLFromTab( content::WebContents* OpenURLFromTab(
@ -90,7 +92,7 @@ class CommonWebContentsDelegate
void SetHtmlApiFullscreen(bool enter_fullscreen); void SetHtmlApiFullscreen(bool enter_fullscreen);
// The window that this WebContents belongs to. // The window that this WebContents belongs to.
NativeWindow* owner_window_; base::WeakPtr<NativeWindow> owner_window_;
// Whether window is fullscreened by HTML5 api. // Whether window is fullscreened by HTML5 api.
bool html_fullscreen_; bool html_fullscreen_;