summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_protocol_handler.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 17:58:24 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 17:58:24 +0000
commit733d0c499d1a6c4dbc20ed1bf998337b6f1fb8b4 (patch)
tree48ad5be34c63ae2b13f476c77a51f27a4af7597e /chrome/browser/external_protocol_handler.cc
parente52f5e94793eefb7632ab698b9b224a57a749abc (diff)
downloadchromium_src-733d0c499d1a6c4dbc20ed1bf998337b6f1fb8b4.zip
chromium_src-733d0c499d1a6c4dbc20ed1bf998337b6f1fb8b4.tar.gz
chromium_src-733d0c499d1a6c4dbc20ed1bf998337b6f1fb8b4.tar.bz2
Enable ExternalProtocolDialog for Chromeos.
* It simply says it's not supported as ChromeOS wont launch external program. Fixed resource files to use chromeos. Apparently I misunderstood how this works when I added 'toolkit_views' to grd files. It was never defined, and wasn't necessary. BUG=23853 TEST=type in "apple.cm" in the omnibox and it should popup the external protocol dialog. Review URL: http://codereview.chromium.org/342040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30593 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_protocol_handler.cc')
-rw-r--r--chrome/browser/external_protocol_handler.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/external_protocol_handler.cc b/chrome/browser/external_protocol_handler.cc
index 8e041be..6855bdc 100644
--- a/chrome/browser/external_protocol_handler.cc
+++ b/chrome/browser/external_protocol_handler.cc
@@ -145,15 +145,11 @@ void ExternalProtocolHandler::LaunchUrl(const GURL& url,
g_accept_requests = false;
if (block_state == UNKNOWN) {
-#if defined(OS_WIN) || defined(TOOLKIT_GTK) || defined(OS_MACOSX)
// Ask the user if they want to allow the protocol. This will call
// LaunchUrlWithoutSecurityCheck if the user decides to accept the protocol.
RunExternalProtocolDialog(escaped_url,
render_process_host_id,
tab_contents_id);
-#endif
- // For now, allow only whitelisted protocols to fire on Linux/Views.
- // See http://crbug.com/23853 .
return;
}