diff options
| author | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 11:22:34 +0000 |
|---|---|---|
| committer | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 11:22:34 +0000 |
| commit | 3e598ff18a9056350a1c46eb8c43418e310c6a8f (patch) | |
| tree | 845dbe4ad343071fb6f42a63c33b78fd045d53a3 /chrome/browser/profiles | |
| parent | bbccb030f144add5375dcdee25ebeefa31af1418 (diff) | |
| download | chromium_src-3e598ff18a9056350a1c46eb8c43418e310c6a8f.zip chromium_src-3e598ff18a9056350a1c46eb8c43418e310c6a8f.tar.gz chromium_src-3e598ff18a9056350a1c46eb8c43418e310c6a8f.tar.bz2 | |
Conditionally include Policy UI based on configuration_policy setting.
BUG=None
TEST=Builds on linux redux bot.
Review URL: http://codereview.chromium.org/7834020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
| -rw-r--r-- | chrome/browser/profiles/profile_io_data.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index d757ba2..6877e06 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -517,8 +517,9 @@ void ProfileIOData::ShutdownOnUIThread() { enable_referrers_.Destroy(); clear_local_state_on_exit_.Destroy(); safe_browsing_enabled_.Destroy(); - if (url_blacklist_manager_.get()) +#if defined(ENABLE_CONFIGURATION_POLICY) url_blacklist_manager_->ShutdownOnUIThread(); +#endif BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind( |