Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(319)

Unified Diff: chrome/browser/ui/browser.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: White spaces Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 2ef6be34d234e4e7bedb82fe9b592761321567f6..89d35dc3b8f1eeb2adc42dd66f81606d5fa2d0fe 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1945,12 +1945,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);
@@ -1963,7 +1957,6 @@ void Browser::OpenFile() {
NULL, 0, FILE_PATH_LITERAL(""),
GetSelectedTabContents(),
parent_window, NULL);
-#endif
}
void Browser::OpenCreateShortcutsDialog() {
@@ -3674,7 +3667,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) ||

Powered by Google App Engine
This is Rietveld 408576698