diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 16:50:21 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 16:50:21 +0000 |
| commit | 517d5740d44c3086e5b47cc9bfb860cbfa2d9e17 (patch) | |
| tree | b358ee866ed8db6d284732d4d5dfebea1395152a | |
| parent | c2fe9dd2f549eb246b6a98397ab542bc6c06bd7d (diff) | |
| download | chromium_src-517d5740d44c3086e5b47cc9bfb860cbfa2d9e17.zip chromium_src-517d5740d44c3086e5b47cc9bfb860cbfa2d9e17.tar.gz chromium_src-517d5740d44c3086e5b47cc9bfb860cbfa2d9e17.tar.bz2 | |
Get panels more functional under Aura.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8537030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109899 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/browser.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index b854c6b..35f6c63 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)); |