| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index e408ab94db08019f1c4ebac05851ea867ae992b5..9b7ac9f793fb73920348c0a6b2f6bec67b3e1753 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -1939,12 +1939,6 @@ void Browser::FocusSearch() {
|
|
|
| void Browser::OpenFile() {
|
| UserMetrics::RecordAction(UserMetricsAction("OpenFile"));
|
| -#if defined(OS_CHROMEOS) && !defined(FILE_MANAGER_EXTENSION)
|
| - FileBrowseUI::OpenPopup(profile_,
|
| - "",
|
| - FileBrowseUI::kPopupWidth,
|
| - FileBrowseUI::kPopupHeight);
|
| -#else
|
| if (!select_file_dialog_.get())
|
| select_file_dialog_ = SelectFileDialog::Create(this);
|
|
|
| @@ -1957,7 +1951,6 @@ void Browser::OpenFile() {
|
| NULL, 0, FILE_PATH_LITERAL(""),
|
| GetSelectedTabContents(),
|
| parent_window, NULL);
|
| -#endif
|
| }
|
|
|
| void Browser::OpenCreateShortcutsDialog() {
|
| @@ -3678,7 +3671,7 @@ void Browser::OnStartDownload(TabContents* source, DownloadItem* download) {
|
| // Open the Active Downloads ui for chromeos.
|
| ActiveDownloadsUI::OpenPopup(profile_);
|
| }
|
| -#else
|
| +#elif !defined(USE_AURA)
|
| // GetDownloadShelf creates the download shelf if it was not yet created.
|
| DownloadShelf* shelf = window()->GetDownloadShelf();
|
| shelf->AddDownload(new DownloadItemModel(download));
|
| @@ -3695,6 +3688,7 @@ void Browser::OnStartDownload(TabContents* source, DownloadItem* download) {
|
| ExtensionService::IsDownloadFromMiniGallery(download->GetURL())) &&
|
| platform_util::IsVisible(shelf_tab->GetNativeView()) &&
|
| ui::Animation::ShouldRenderRichAnimation()) {
|
| + // TODO(saintlou): There is no implementation for Aura.
|
| DownloadStartedAnimation::Show(shelf_tab);
|
| }
|
| #endif
|
|
|