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

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

Issue 8537030: Get panels more functional under Aura. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix for Aura non-ChromeOS case. Created 9 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index b854c6b402238ac52e167e10b91220d5f5cd8b71..35f6c63f40cf6c8962c549bfddf81c2e3faaff9f 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -3723,9 +3723,7 @@ void Browser::OnStartDownload(TabContents* source, DownloadItem* download) {
return;
if (DisplayOldDownloadsUI()) {
-#if defined(USE_AURA)
- // TODO(saintlou): There is no implementation for Aura.
-#elif defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS)
// Don't show content browser for extension/theme downloads from gallery.
ExtensionService* service = profile_->GetExtensionService();
if (!ChromeDownloadManagerDelegate::IsExtensionDownload(download) ||
@@ -3735,7 +3733,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));
@@ -4436,7 +4434,7 @@ gfx::Rect Browser::GetInstantBounds() {
// Browser, protected:
BrowserWindow* Browser::CreateBrowserWindow() {
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) || defined(USE_AURA)
if (type_ == TYPE_PANEL) {
DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisablePanels));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698