diff options
author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 18:19:25 +0000 |
---|---|---|
committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 18:19:25 +0000 |
commit | f5bf8ccfcaa51e3f8b12e7eaf4bb26fa6bf2d69c (patch) | |
tree | 98b1017d118b3157a449d0b917b3c1ce57869f81 /chrome/browser/dom_ui/filebrowse_ui.h | |
parent | cd023e807914d91d64e325391bde25ff0bdea3f3 (diff) | |
download | chromium_src-f5bf8ccfcaa51e3f8b12e7eaf4bb26fa6bf2d69c.zip chromium_src-f5bf8ccfcaa51e3f8b12e7eaf4bb26fa6bf2d69c.tar.gz chromium_src-f5bf8ccfcaa51e3f8b12e7eaf4bb26fa6bf2d69c.tar.bz2 |
Show the filebrowse ui rather than the download shelf in chromeos.
This cl displays the filebrowse ui rather than download shelf for
downloads in chrom(e|ium) os. It conditionally replaces (with
preprocessor macros) the Browser::OnStartDownload method to do this.
The cl adds a static FileBrowseUI::OpenPopup(profile, hashArgument),
which opens the file browse ui and passes it the provided hash argument.
This is invoked directly from Browser::OnStartDownload. The
USBMountObserver code was changed to call this static method, rather
than open the popup by hand as it had been doing.
I'm not sure about ownership of the Browser* returned by OpenPopup, but
based on other code in the tree I assume chrome will deal with freeing
it when appropriate.
Before this change, USBMountObserver would add the window to registrar_
*before* showing it. Now that FileBrowseUI::OpenPopup returns a which
which is already visible, this is no longer the case. I assume this
won't be a problem.
Commit this for rginda.
Original review: http://codereview.chromium.org/555167
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/564022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/filebrowse_ui.h')
-rw-r--r-- | chrome/browser/dom_ui/filebrowse_ui.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/filebrowse_ui.h b/chrome/browser/dom_ui/filebrowse_ui.h index 5f45fe4..1c16536 100644 --- a/chrome/browser/dom_ui/filebrowse_ui.h +++ b/chrome/browser/dom_ui/filebrowse_ui.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_DOM_UI_FILEBROWSE_UI_H_ #define CHROME_BROWSER_DOM_UI_FILEBROWSE_UI_H_ +#include <string> + #include "base/file_path.h" #include "base/scoped_ptr.h" #include "base/values.h" @@ -14,12 +16,15 @@ #include "net/base/directory_lister.h" -class GURL; +class Browser; +class Profile; class FileBrowseUI : public HtmlDialogUI { public: explicit FileBrowseUI(TabContents* contents); + static Browser *OpenPopup(Profile *profile, const std::string hashArgument); + private: DISALLOW_COPY_AND_ASSIGN(FileBrowseUI); }; |