diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 21:16:58 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 21:16:58 +0000 |
| commit | 3b366aecc4998db2e9ee43ca8737f24f473ea96b (patch) | |
| tree | d24e2281414489d4b62e9ec67b6f6da6a44d7a24 /chrome/browser/ui/browser_commands.cc | |
| parent | 85ee5bb142b5a315edd02899ada327cb90ccae22 (diff) | |
| download | chromium_src-3b366aecc4998db2e9ee43ca8737f24f473ea96b.zip chromium_src-3b366aecc4998db2e9ee43ca8737f24f473ea96b.tar.gz chromium_src-3b366aecc4998db2e9ee43ca8737f24f473ea96b.tar.bz2 | |
content: Extract url utility functions into url_utils.{h,cc}
BUG=104549
R=joi@chromium.org,asanka@chromium.org
TBR=thestig@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15021020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_commands.cc')
| -rw-r--r-- | chrome/browser/ui/browser_commands.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index cd166835..09eaff5 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -16,7 +16,6 @@ #include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/chrome_page_zoom.h" #include "chrome/browser/devtools/devtools_window.h" -#include "chrome/browser/download/download_util.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" @@ -71,6 +70,7 @@ #include "content/public/common/content_restriction.h" #include "content/public/common/renderer_preferences.h" #include "content/public/common/url_constants.h" +#include "content/public/common/url_utils.h" #include "net/base/escape.h" #include "webkit/glue/glue_serialize.h" #include "webkit/user_agent/user_agent_util.h" @@ -247,7 +247,7 @@ int GetContentRestrictions(const Browser* browser) { NavigationEntry* active_entry = current_tab->GetController().GetActiveEntry(); // See comment in UpdateCommandsForTabState about why we call url(). - if (!download_util::IsSavableURL( + if (!content::IsSavableURL( active_entry ? active_entry->GetURL() : GURL()) || current_tab->ShowingInterstitialPage()) content_restrictions |= content::CONTENT_RESTRICTION_SAVE; |