summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-25 14:12:10 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-25 14:12:10 +0000
commited2b10090d8bb61951e0572e4e134ef62d091d9c (patch)
tree923e7b160af96ae643f30fe541f8773956fa0e37 /content
parente257d5b82922051e9a9ee75fd282c46c1a5cf5c2 (diff)
downloadchromium_src-ed2b10090d8bb61951e0572e4e134ef62d091d9c.zip
chromium_src-ed2b10090d8bb61951e0572e4e134ef62d091d9c.tar.gz
chromium_src-ed2b10090d8bb61951e0572e4e134ef62d091d9c.tar.bz2
Move external protocol handling from TC.
BUG=71097 TEST=no change Review URL: http://codereview.chromium.org/7065038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/DEPS2
-rw-r--r--content/browser/renderer_host/resource_dispatcher_host.cc2
-rw-r--r--content/browser/tab_contents/tab_contents.cc2
3 files changed, 2 insertions, 4 deletions
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 7abd313..b3b6dbb 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -34,7 +34,7 @@ include_rules = [
"+chrome/common/extensions/extension.h",
"+chrome/common/extensions/user_script.h",
- "+chrome/browser/external_protocol_handler.h",
+ "+chrome/browser/external_protocol/external_protocol_handler.h",
"+chrome/browser/load_from_memory_cache_details.h",
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc
index 37e7e8e..3567285 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -23,7 +23,7 @@
#include "chrome/browser/download/download_request_limiter.h"
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/download/save_file_manager.h"
-#include "chrome/browser/external_protocol_handler.h"
+#include "chrome/browser/external_protocol/external_protocol_handler.h"
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/prerender/prerender_tracker.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 19b36c3..51b9623 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/debugger/devtools_manager.h"
#include "chrome/browser/defaults.h"
-#include "chrome/browser/external_protocol_handler.h"
#include "chrome/browser/load_from_memory_cache_details.h"
#include "chrome/browser/notifications/desktop_notification_service.h"
#include "chrome/browser/notifications/desktop_notification_service_factory.h"
@@ -1737,7 +1736,6 @@ WebPreferences TabContents::GetWebkitPrefs() {
void TabContents::OnUserGesture() {
// Notify observers.
FOR_EACH_OBSERVER(TabContentsObserver, observers_, DidGetUserGesture());
- ExternalProtocolHandler::PermitLaunchUrl();
}
void TabContents::OnIgnoredUIEvent() {