diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 23:42:01 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 23:42:01 +0000 |
| commit | e7557f174361a743cad821e0828e8df77d9ac199 (patch) | |
| tree | 33af40724a4492a1ac1c3b95701a079c1c724662 /chrome/browser/ui/webui | |
| parent | 2ccf45c50fad0f2c3c20d95eef6d0040b565b291 (diff) | |
| download | chromium_src-e7557f174361a743cad821e0828e8df77d9ac199.zip chromium_src-e7557f174361a743cad821e0828e8df77d9ac199.tar.gz chromium_src-e7557f174361a743cad821e0828e8df77d9ac199.tar.bz2 | |
Move DownloadPrefs ownership to chrome layer.
BUG=82782
Review URL: http://codereview.chromium.org/7693003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
| -rw-r--r-- | chrome/browser/ui/webui/downloads_dom_handler.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/advanced_options_handler.cc | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index a48e818..61ba8b2 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -232,7 +232,8 @@ void DownloadsDOMHandler::HandleClearAll(const ListValue* args) { } void DownloadsDOMHandler::HandleOpenDownloadsFolder(const ListValue* args) { - FilePath path = download_manager_->download_prefs()->download_path(); + FilePath path = DownloadPrefs::FromDownloadManager(download_manager_)-> + download_path(); #if defined(OS_MACOSX) // Must be called from the UI thread on Mac. diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc index 501df48..780512b 100644 --- a/chrome/browser/ui/webui/options/advanced_options_handler.cc +++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc @@ -384,7 +384,7 @@ void AdvancedOptionsHandler::HandleAutoOpenButton(const ListValue* args) { DownloadManager* manager = web_ui_->tab_contents()->browser_context()->GetDownloadManager(); if (manager) - manager->download_prefs()->ResetAutoOpen(); + DownloadPrefs::FromDownloadManager(manager)->ResetAutoOpen(); } void AdvancedOptionsHandler::HandleMetricsReportingCheckbox( @@ -608,7 +608,8 @@ void AdvancedOptionsHandler::SetupAutoOpenFileTypesDisabledAttribute() { // We enable the button if the user has any auto-open file types registered. DownloadManager* manager = web_ui_->tab_contents()->browser_context()->GetDownloadManager(); - bool disabled = !(manager && manager->download_prefs()->IsAutoOpenUsed()); + bool disabled = !(manager && + DownloadPrefs::FromDownloadManager(manager)->IsAutoOpenUsed()); base::FundamentalValue value(disabled); web_ui_->CallJavascriptFunction( "options.AdvancedOptions.SetAutoOpenFileTypesDisabledAttribute", value); |