Touch constants and dead code removal.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 1290 matching lines @@
     *success = true;
   }
 }
 
 void TestingAutomationProvider::GetShelfVisibility(int handle, bool* visible) {
   *visible = false;
 
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
-      *visible = ActiveDownloadsUI::GetPopup(NULL);
-#elif defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS)
       *visible = ActiveDownloadsUI::GetPopup();
 #else
       *visible = browser->window()->IsDownloadShelfVisible();
 #endif
     }
   }
 }
 
 void TestingAutomationProvider::IsFullscreen(int handle, bool* visible) {
   *visible = false;
@@ skipping 854 matching lines @@
 
 void TestingAutomationProvider::SavePackageShouldPromptUser(
     bool should_prompt) {
   SavePackageFilePicker::SetShouldPromptUser(should_prompt);
 }
 
 void TestingAutomationProvider::SetShelfVisibility(int handle, bool visible) {
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
-      Browser* browser_download = NULL;
-      TabContents* download_contents =
-          ActiveDownloadsUI::GetPopup(&browser_download);
-      if (!download_contents && visible)
-        ActiveDownloadsUI::OpenPopup(browser_download->profile());
-      if (download_contents && !visible)
-        browser_download->CloseTabContents(download_contents);
-#elif defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS)
       Browser* popup_browser = ActiveDownloadsUI::GetPopup();
       if (!popup_browser && visible)
         ActiveDownloadsUI::OpenPopup(browser->profile());
       if (popup_browser && !visible)
         popup_browser->CloseWindow();
 #else
       if (visible)
         browser->window()->GetDownloadShelf()->Show();
       else
         browser->window()->GetDownloadShelf()->Close();
@@ skipping 4181 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }