ifdef out a bunch of Mac-specific code

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

View file

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

View file

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

View file

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

View file

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