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

web_view_ => content_view_

Browse source
This commit is contained in:
Cheng Zhao 2018-04-08 19:32:10 +09:00
parent 97e8800677
commit 13473ee138
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/native_window_views.h
View file

@ -142,7 +142,7 @@ class NativeWindowViews : public NativeWindow,
void SetEnabled(bool enable) override;
views::Widget* widget() const { return window_.get(); }
views::View* web_view() const { return web_view_; }
views::View* content_view() const { return content_view_; }
SkRegion* draggable_region() const { return draggable_region_.get(); }
#if defined(OS_WIN)
@ -209,7 +209,7 @@ class NativeWindowViews : public NativeWindow,
ui::WindowShowState GetRestoredState();
std::unique_ptr<views::Widget> window_;
views::View* web_view_; // Managed by inspectable_web_contents_.
views::View* content_view_; // Weak ref.
views::View* focused_view_; // The view should be focused by default.
std::unique_ptr<MenuBar> menu_bar_;