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

Require !OS_MACOSX as well as TOOLKIT_VIEWS for views code

Browse source
This commit is contained in:
Jeremy Apthorp 2018-05-10 13:52:17 -07:00
parent 1cc5492784
commit 87d0175c76
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/common_web_contents_delegate.h
View file

@ -15,7 +15,7 @@
#include "brightray/browser/inspectable_web_contents_view_delegate.h"
#include "content/public/browser/web_contents_delegate.h"
#if defined(TOOLKIT_VIEWS)
#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
#include "atom/browser/ui/autofill_popup.h"
#endif
@ -91,7 +91,7 @@ class CommonWebContentsDelegate
const content::NativeWebKeyboardEvent& event) override;
// Autofill related events.
#if defined(TOOLKIT_VIEWS)
#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
void ShowAutofillPopup(bool offscreen,
content::RenderFrameHost* frame_host,
const gfx::RectF& bounds,
@ -118,7 +118,7 @@ class CommonWebContentsDelegate
const std::string& query) override;
// brightray::InspectableWebContentsViewDelegate:
#if defined(TOOLKIT_VIEWS)
#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
gfx::ImageSkia GetDevToolsWindowIcon() override;
#endif
#if defined(USE_X11)
@ -165,7 +165,7 @@ class CommonWebContentsDelegate
bool native_fullscreen_;
// UI related helper classes.
#if defined(TOOLKIT_VIEWS)
#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
std::unique_ptr<AutofillPopup> autofill_popup_;
#endif
std::unique_ptr<WebDialogHelper> web_dialog_helper_;