| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index e408ab94db08019f1c4ebac05851ea867ae992b5..4152795d6f41c6e0db72a76d2dbeb94375bb276b 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() {
|
| @@ -3668,7 +3661,9 @@ void Browser::OnStartDownload(TabContents* source, DownloadItem* download) {
|
| return;
|
|
|
| if (DisplayOldDownloadsUI()) {
|
| -#if defined(OS_CHROMEOS)
|
| +#if defined(USE_AURA)
|
| + // TODO(saintlou): There is no implementation for Aura.
|
| +#elif defined(OS_CHROMEOS)
|
| // Don't show content browser for extension/theme downloads from gallery.
|
| ExtensionService* service = profile_->GetExtensionService();
|
| if (!ChromeDownloadManagerDelegate::IsExtensionDownload(download) ||
|
|
|