diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 14:39:17 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 14:39:17 +0000 |
| commit | 6bf2b750d4fd96799569e2c6fe13f844fdd741c0 (patch) | |
| tree | 188a1b4974a677ddeeac8d1e1ee066df9f204d41 /chrome | |
| parent | 4099aa294d2d13a305152e62a2a4ce2262921040 (diff) | |
| download | chromium_src-6bf2b750d4fd96799569e2c6fe13f844fdd741c0.zip chromium_src-6bf2b750d4fd96799569e2c6fe13f844fdd741c0.tar.gz chromium_src-6bf2b750d4fd96799569e2c6fe13f844fdd741c0.tar.bz2 | |
Make safe_browsing=0 build again.
Building without safe browsing doesn't work after r92438 as an ifdef was
missed and another was incorrect. Fixed.
R=mirandac@chromium.org
Review URL: http://codereview.chromium.org/7367003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/chrome_render_view_observer.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc index 4e42298..348b223 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc @@ -641,6 +641,7 @@ void TabContentsWrapper::UpdateRendererPreferences() { } void TabContentsWrapper::UpdateSafebrowsingDetectionHost() { +#if defined(ENABLE_SAFE_BROWSING) PrefService* prefs = profile()->GetPrefs(); bool safe_browsing = prefs->GetBoolean(prefs::kSafeBrowsingEnabled); if (safe_browsing && @@ -654,6 +655,7 @@ void TabContentsWrapper::UpdateSafebrowsingDetectionHost() { } render_view_host()->Send( new ViewMsg_SetClientSidePhishingDetection(routing_id(), safe_browsing)); +#endif } void TabContentsWrapper::RemoveInfoBarInternal(InfoBarDelegate* delegate, diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc index 73e8c94..046e965 100644 --- a/chrome/renderer/chrome_render_view_observer.cc +++ b/chrome/renderer/chrome_render_view_observer.cc @@ -348,7 +348,7 @@ void ChromeRenderViewObserver::OnSetAllowRunningInsecureContent(bool allow) { void ChromeRenderViewObserver::OnSetClientSidePhishingDetection( bool enable_phishing_detection) { -#if !defined(OS_CHROMEOS) || !defined(ENABLE_SAFE_BROWSING) +#if defined(ENABLE_SAFE_BROWSING) && !defined(OS_CHROMEOS) phishing_classifier_ = enable_phishing_detection ? safe_browsing::PhishingClassifierDelegate::Create( render_view(), NULL) : |