mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
8991ad31d8
* Store InspectableWebContents instead of InspectableWebContentsView in NativeBrowserView
* Rename system_drag_exclude_areas => drag_exclude_rects
* Use NSView convertRect:toView: for BrowserView DragRegionView positioning
* Make BrowserView DragRegionViews children of the WebContents view
Previously they were children of the `InspectableWebContentsView` view,
which caused this assertion to fail:
f993888424/brightray/browser/mac/bry_inspectable_web_contents_view.mm (L162)
* Update draggable regions when changing BrowserView
Fixes #12150.
30 lines
818 B
C++
30 lines
818 B
C++
// Copyright (c) 2017 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include <vector>
|
|
|
|
#include "atom/browser/native_browser_view.h"
|
|
|
|
#include "atom/browser/api/atom_api_web_contents.h"
|
|
#include "brightray/browser/inspectable_web_contents.h"
|
|
|
|
namespace atom {
|
|
|
|
NativeBrowserView::NativeBrowserView(
|
|
brightray::InspectableWebContents* inspectable_web_contents)
|
|
: inspectable_web_contents_(inspectable_web_contents) {}
|
|
|
|
NativeBrowserView::~NativeBrowserView() {}
|
|
|
|
brightray::InspectableWebContentsView*
|
|
NativeBrowserView::GetInspectableWebContentsView() {
|
|
return inspectable_web_contents_->GetView();
|
|
}
|
|
|
|
content::WebContents* NativeBrowserView::GetWebContents() {
|
|
return inspectable_web_contents_->GetWebContents();
|
|
}
|
|
|
|
} // namespace atom
|