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

Save browser_view_ in the NativeWindow

Browse source 
No need to store it separately in subclasses.
This commit is contained in:
Cheng Zhao 2018-03-06 15:04:40 +09:00
parent 503b0ba1b1
commit 3b3e69f8b2
8 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window.h
View file

@ -292,6 +292,7 @@ class NativeWindow : public base::SupportsUserData,
void set_is_offscreen_dummy(bool is_dummy) { is_osr_dummy_ = is_dummy; }
bool is_offscreen_dummy() const { return is_osr_dummy_; }
NativeBrowserView* browser_view() const { return browser_view_; }
NativeWindow* parent() const { return parent_; }
bool is_modal() const { return is_modal_; }
@ -300,6 +301,10 @@ class NativeWindow : public base::SupportsUserData,
const mate::Dictionary& options,
NativeWindow* parent);
void set_browser_view(NativeBrowserView* browser_view) {
browser_view_ = browser_view;
}
private:
// Whether window has standard frame.
bool has_frame_;
@ -335,6 +340,9 @@ class NativeWindow : public base::SupportsUserData,
// Is this a dummy window for an offscreen WebContents.
bool is_osr_dummy_;
// The browser view layer.
NativeBrowserView* browser_view_;
// The page this window is viewing.
brightray::InspectableWebContents* inspectable_web_contents_;