Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8237)

Unified Diff: chrome/browser/ui/browser_commands.cc

Issue 15021020: content: Extract url utility functions into url_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix content_unittests and content_browsertests Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 27da5db41d9150a8ea2f8ea5ad5aeb71a62d8f07..2c81e13dccd89ef6aeb9c63e7083e8cb1941b033 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"
@@ -246,7 +246,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;
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698