diff options
Diffstat (limited to 'chrome/browser/external_protocol/external_protocol_handler.cc')
| -rw-r--r-- | chrome/browser/external_protocol/external_protocol_handler.cc | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc index faaec1d..657709c 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc @@ -39,13 +39,13 @@ namespace { // Functions enabling unit testing. Using a NULL delegate will use the default // behavior; if a delegate is provided it will be used instead. -ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker( - ShellIntegration::DefaultWebClientObserver* observer, +shell_integration::DefaultProtocolClientWorker* CreateShellWorker( + shell_integration::DefaultWebClientObserver* observer, const std::string& protocol, ExternalProtocolHandler::Delegate* delegate) { if (!delegate) - return new ShellIntegration::DefaultProtocolClientWorker(observer, - protocol); + return new shell_integration::DefaultProtocolClientWorker(observer, + protocol); return delegate->CreateShellWorker(observer, protocol); } @@ -94,7 +94,7 @@ void LaunchUrlWithoutSecurityCheckWithDelegate( // we check if that external application will be us. If it is we just ignore // the request. class ExternalDefaultProtocolObserver - : public ShellIntegration::DefaultWebClientObserver { + : public shell_integration::DefaultWebClientObserver { public: ExternalDefaultProtocolObserver(const GURL& escaped_url, int render_process_host_id, @@ -112,19 +112,19 @@ class ExternalDefaultProtocolObserver has_user_gesture_(has_user_gesture) {} void SetDefaultWebClientUIState( - ShellIntegration::DefaultWebClientUIState state) override { + shell_integration::DefaultWebClientUIState state) override { DCHECK(base::MessageLoopForUI::IsCurrent()); // If we are still working out if we're the default, or we've found // out we definately are the default, we end here. - if (state == ShellIntegration::STATE_PROCESSING) { + if (state == shell_integration::STATE_PROCESSING) { return; } if (delegate_) delegate_->FinishedProcessingCheck(); - if (state == ShellIntegration::STATE_IS_DEFAULT) { + if (state == shell_integration::STATE_IS_DEFAULT) { if (delegate_) delegate_->BlockRequest(); return; @@ -291,15 +291,11 @@ void ExternalProtocolHandler::LaunchUrlWithDelegate( // The worker creates tasks with references to itself and puts them into // message loops. When no tasks are left it will delete the observer and // eventually be deleted itself. - ShellIntegration::DefaultWebClientObserver* observer = - new ExternalDefaultProtocolObserver(url, - render_process_host_id, - tab_contents_id, - block_state == UNKNOWN, - page_transition, - has_user_gesture, - delegate); - scoped_refptr<ShellIntegration::DefaultProtocolClientWorker> worker = + shell_integration::DefaultWebClientObserver* observer = + new ExternalDefaultProtocolObserver( + url, render_process_host_id, tab_contents_id, block_state == UNKNOWN, + page_transition, has_user_gesture, delegate); + scoped_refptr<shell_integration::DefaultProtocolClientWorker> worker = CreateShellWorker(observer, escaped_url.scheme(), delegate); // Start the check process running. This will send tasks to the FILE thread |