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

ifdef out a bunch of Mac-specific code

Browse source 
This is a hacky solution but helps us deal with other compiler/linker errors.
This commit is contained in:
Adam Roben 2013-05-21 11:39:25 -04:00
parent 12773cff6e
commit 12d01e4fd5
4 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/browser_client.cc
View file

@ -34,8 +34,10 @@ BrowserContext* BrowserClient::browser_context() {
} }
NotificationPresenter* BrowserClient::notification_presenter() { NotificationPresenter* BrowserClient::notification_presenter() {
#if defined(OS_MACOSX)
if (!notification_presenter_) if (!notification_presenter_)
notification_presenter_.reset(NotificationPresenter::Create()); notification_presenter_.reset(NotificationPresenter::Create());
#endif
return notification_presenter_.get(); return notification_presenter_.get();
} }

2
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -41,7 +41,9 @@ InspectableWebContentsImpl::InspectableWebContentsImpl(content::WebContents* web
auto context = static_cast<BrowserContext*>(web_contents_->GetBrowserContext()); auto context = static_cast<BrowserContext*>(web_contents_->GetBrowserContext());
dock_side_ = context->prefs()->GetString(kDockSidePref); dock_side_ = context->prefs()->GetString(kDockSidePref);
#if defined(OS_MACOSX)
view_.reset(CreateInspectableContentsView(this)); view_.reset(CreateInspectableContentsView(this));
#endif
} }
InspectableWebContentsImpl::~InspectableWebContentsImpl() { InspectableWebContentsImpl::~InspectableWebContentsImpl() {

2
brightray/common/main_delegate.cc
View file

@ -32,8 +32,8 @@ void MainDelegate::PreSandboxStartup() {
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
OverrideChildProcessPath(); OverrideChildProcessPath();
OverrideFrameworkBundlePath(); OverrideFrameworkBundlePath();
#endif
InitializeResourceBundle(); InitializeResourceBundle();
#endif
} }
} }

2
brightray/common/main_delegate.h
View file

@ -34,8 +34,8 @@ protected:
virtual void PreSandboxStartup() OVERRIDE; virtual void PreSandboxStartup() OVERRIDE;
private: private:
void InitializeResourceBundle();
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
void InitializeResourceBundle();
static void OverrideChildProcessPath(); static void OverrideChildProcessPath();
static void OverrideFrameworkBundlePath(); static void OverrideFrameworkBundlePath();
#endif #endif