| Index: chrome/browser/views/external_protocol_dialog.h
|
| ===================================================================
|
| --- chrome/browser/views/external_protocol_dialog.h (revision 25293)
|
| +++ chrome/browser/views/external_protocol_dialog.h (working copy)
|
| @@ -1,9 +1,9 @@
|
| -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_EXTERNAL_PROTOCOL_DIALOG_H__
|
| -#define CHROME_BROWSER_EXTERNAL_PROTOCOL_DIALOG_H__
|
| +#ifndef CHROME_BROWSER_EXTERNAL_PROTOCOL_DIALOG_H_
|
| +#define CHROME_BROWSER_EXTERNAL_PROTOCOL_DIALOG_H_
|
|
|
| #include "base/time.h"
|
| #include "googleurl/src/gurl.h"
|
| @@ -14,20 +14,10 @@
|
|
|
| class ExternalProtocolDialog : public views::DialogDelegate {
|
| public:
|
| - // Creates and runs a External Protocol dialog box.
|
| - // |url| - The url of the request.
|
| - // |command| - the command that ShellExecute will run.
|
| - // |render_process_host_id| and |routing_id| are used by
|
| - // tab_util::GetTabContentsByID to aquire the tab contents associated with
|
| - // this dialog.
|
| - // NOTE: There is a race between the Time of Check and the Time Of Use for
|
| - // the command line. Since the caller (web page) does not have access
|
| - // to change the command line by itself, we do not do anything special
|
| - // to protect against this scenario.
|
| - static void RunExternalProtocolDialog(const GURL& url,
|
| - const std::wstring& command,
|
| - int render_process_host_id,
|
| - int routing_id);
|
| + // RunExternalProtocolDialog calls this private constructor.
|
| + ExternalProtocolDialog(TabContents* tab_contents,
|
| + const GURL& url,
|
| + const std::wstring& command);
|
|
|
| // Returns the path of the application to be launched given the protocol
|
| // of the requested url. Returns an empty string on failure.
|
| @@ -49,11 +39,6 @@
|
| virtual bool IsModal() const { return false; }
|
|
|
| private:
|
| - // RunExternalProtocolDialog calls this private constructor.
|
| - ExternalProtocolDialog(TabContents* tab_contents,
|
| - const GURL& url,
|
| - const std::wstring& command);
|
| -
|
| // The message box view whose commands we handle.
|
| MessageBoxView* message_box_view_;
|
|
|
| @@ -66,7 +51,7 @@
|
| // The time at which this dialog was created.
|
| base::Time creation_time_;
|
|
|
| - DISALLOW_EVIL_CONSTRUCTORS(ExternalProtocolDialog);
|
| + DISALLOW_COPY_AND_ASSIGN(ExternalProtocolDialog);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_EXTERNAL_PROTOCOL_DIALOG_H__
|
| +#endif // CHROME_BROWSER_EXTERNAL_PROTOCOL_DIALOG_H_
|
|
|