Preliminary work to allow Chrome to build with USE_AURA

chrome/browser/automation/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/automation_provider.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 78 matching lines @@
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/json_value_serializer.h"
 #include "content/common/view_messages.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h"
 #include "webkit/glue/password_form.h"
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/external_tab_container_win.h"
 #endif  // defined(OS_WIN)
 
 using WebKit::WebFindOptions;
 using base::Time;
 
 AutomationProvider::AutomationProvider(Profile* profile)
     : profile_(profile),
       reply_message_(NULL),
       reinitialize_on_channel_error_(
@@ skipping 245 matching lines @@
         AutomationMsg_ExecuteExtensionActionInActiveTabAsync,
         ExecuteExtensionActionInActiveTabAsync)
     IPC_MESSAGE_HANDLER(AutomationMsg_MoveExtensionBrowserAction,
                         MoveExtensionBrowserAction)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetExtensionProperty,
                         GetExtensionProperty)
     IPC_MESSAGE_HANDLER(AutomationMsg_SaveAsAsync, SaveAsAsync)
     IPC_MESSAGE_HANDLER(AutomationMsg_RemoveBrowsingData, RemoveBrowsingData)
     IPC_MESSAGE_HANDLER(AutomationMsg_JavaScriptStressTestControl,
                         JavaScriptStressTestControl)
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
     // These are for use with external tabs.
     IPC_MESSAGE_HANDLER(AutomationMsg_CreateExternalTab, CreateExternalTab)
     IPC_MESSAGE_HANDLER(AutomationMsg_ProcessUnhandledAccelerator,
                         ProcessUnhandledAccelerator)
     IPC_MESSAGE_HANDLER(AutomationMsg_SetInitialFocus, SetInitialFocus)
     IPC_MESSAGE_HANDLER(AutomationMsg_TabReposition, OnTabReposition)
     IPC_MESSAGE_HANDLER(AutomationMsg_ForwardContextMenuCommandToChrome,
                         OnForwardContextMenuCommandToChrome)
     IPC_MESSAGE_HANDLER(AutomationMsg_NavigateInExternalTab,
                         NavigateInExternalTab)
@@ skipping 583 matching lines @@
     }
   }
 }
 
 void AutomationProvider::SaveAsAsync(int tab_handle) {
   NavigationController* tab = NULL;
   TabContents* tab_contents = GetTabContentsForHandle(tab_handle, &tab);
   if (tab_contents)
     tab_contents->OnSavePage();
 }