summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 19:56:40 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 19:56:40 +0000
commitde37a4d79e9417eb2e8def404788ce2d3dacf09e (patch)
tree199a21c40dd66819ba43f972f41d88b74fec14a9 /chrome
parenta66fcdf46f47674bac5f803b2903c19d0049731f (diff)
downloadchromium_src-de37a4d79e9417eb2e8def404788ce2d3dacf09e.zip
chromium_src-de37a4d79e9417eb2e8def404788ce2d3dacf09e.tar.gz
chromium_src-de37a4d79e9417eb2e8def404788ce2d3dacf09e.tar.bz2
Fix automation for IsDownloadShelfVisible for aura
Aura has download shelf on chromeos instead of the downloads panel like the other boards. Fix automation. BUG=chromium-os:23648 TEST=pyauto downloads tests fixed on chromeos aura builds Review URL: https://chromiumcodereview.appspot.com/9225017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index d883808..41cc1f9 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -1380,7 +1380,7 @@ void TestingAutomationProvider::GetShelfVisibility(int handle, bool* visible) {
if (browser_tracker_->ContainsHandle(handle)) {
Browser* browser = browser_tracker_->GetResource(handle);
if (browser) {
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) && !defined(USE_AURA)
*visible = ActiveDownloadsUI::GetPopup();
#else
*visible = browser->window()->IsDownloadShelfVisible();