diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 06:43:51 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 06:43:51 +0000 |
| commit | bfaf3d921a67ff2c51db15f0287adcf3923a6331 (patch) | |
| tree | 4357f70ee65c313b65d90ca47d90fce252eda0c6 /chrome/browser/ui/browser_navigator.cc | |
| parent | 17e98540e081641361a19763f9a7746b4de4770e (diff) | |
| download | chromium_src-bfaf3d921a67ff2c51db15f0287adcf3923a6331.zip chromium_src-bfaf3d921a67ff2c51db15f0287adcf3923a6331.tar.gz chromium_src-bfaf3d921a67ff2c51db15f0287adcf3923a6331.tar.bz2 | |
Remove ExtensionService::ShouldBlockUrlInBrowserTab()
This is only called from only location (in BrowserNavigator) and doesn't belong
in ExtensionService. Instead, inline it in BrowserNavigator.
BUG=351891
Review URL: https://codereview.chromium.org/197883019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_navigator.cc')
| -rw-r--r-- | chrome/browser/ui/browser_navigator.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index 0a96541e..59f9eab 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -12,7 +12,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_about_handler.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" @@ -41,7 +40,9 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" #if defined(USE_ASH) #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" @@ -485,9 +486,12 @@ void Navigate(NavigateParams* params) { if (!AdjustNavigateParamsForURL(params)) return; - ExtensionService* service = params->initiating_profile->GetExtensionService(); - if (service) - service->ShouldBlockUrlInBrowserTab(¶ms->url); + const extensions::Extension* extension = + extensions::ExtensionRegistry::Get(params->initiating_profile)-> + enabled_extensions().GetExtensionOrAppByURL(params->url); + // Platform apps cannot navigate. Block the request. + if (extension && extension->is_platform_app()) + params->url = GURL(chrome::kExtensionInvalidRequestURL); // The browser window may want to adjust the disposition. if (params->disposition == NEW_POPUP && |