Preliminary work to allow Chrome to build with USE_AURA

chrome/browser/automation/automation_provider.h

 // 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.
 
 // This implements a browser-side endpoint for UI automation activity.
 // The client-side endpoint is implemented by AutomationProxy.
 // The entire lifetime of this object should be contained within that of
 // the BrowserProcess, and in particular the NotificationService that's
 // hung off of it.
 
@@ skipping 13 matching lines @@
 #include "base/string16.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/content_settings.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/cancelable_request.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/common/notification_observer.h"
 #include "ipc/ipc_channel.h"
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 #include "ui/gfx/native_widget_types.h"
 #include "views/events/event.h"
-#endif  // defined(OS_WIN)
+#endif  // defined(OS_WIN) && !defined(USE_AURA)
 
 class PopupMenuWaiter;
 class TabContents;
 struct AutomationMsg_Find_Params;
 struct Reposition_Params;
 struct ExternalTabSettings;
 
 namespace IPC {
 class ChannelProxy;
 }
@@ skipping 94 matching lines @@
     IPC::Message* reply_message = reply_message_;
     reply_message_ = NULL;
     return reply_message;
   }
 
   // Adds the extension passed in to the extension tracker, and returns
   // the associated handle. If the tracker already contains the extension,
   // the handle is simply returned.
   int AddExtension(const Extension* extension);
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // Adds the external tab passed in to the tab tracker.
   bool AddExternalTab(ExternalTabContainer* external_tab);
 #endif
 
   // Get the DictionaryValue equivalent for a download item. Caller owns the
   // DictionaryValue.
   base::DictionaryValue* GetDictionaryFromDownloadItem(
       const DownloadItem* download);
 
  protected:
@@ skipping 151 matching lines @@
   // the associated extension is enabled. Returns NULL otherwise.
   const Extension* GetEnabledExtension(int extension_handle);
 
   // Returns the extension for the given handle, if the handle is valid and
   // the associated extension is disabled. Returns NULL otherwise.
   const Extension* GetDisabledExtension(int extension_handle);
 
   // Method called by the popup menu tracker when a popup menu is opened.
   void NotifyPopupMenuOpened();
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // The functions in this block are for use with external tabs, so they are
   // Windows only.
 
   // The container of an externally hosted tab calls this to reflect any
   // accelerator keys that it did not process. This gives the tab a chance
   // to handle the keys
   void ProcessUnhandledAccelerator(const IPC::Message& message, int handle,
                                    const MSG& msg);
 
   void SetInitialFocus(const IPC::Message& message, int handle, bool reverse,
@@ skipping 29 matching lines @@
                                  const std::string& origin,
                                  const std::string& target);
 
   void OnBrowserMoved(int handle);
 
   void OnRunUnloadHandlers(int handle, IPC::Message* reply_message);
 
   void OnSetZoomLevel(int handle, int zoom_level);
 
   ExternalTabContainer* GetExternalTabForHandle(int handle);
-#endif  // defined(OS_WIN)
+#endif  // defined(OS_WIN) && !defined(USE_AURA)
 
   scoped_ptr<IPC::ChannelProxy> channel_;
   scoped_ptr<NotificationObserver> new_tab_ui_load_observer_;
   scoped_ptr<NotificationObserver> find_in_page_observer_;
   scoped_ptr<ExtensionTestResultNotificationObserver>
       extension_test_result_observer_;
   scoped_ptr<AutomationExtensionTracker> extension_tracker_;
 
   // True iff connected to an AutomationProxy.
   bool is_connected_;
 
   // True iff browser finished loading initial set of tabs.
   bool initial_tab_loads_complete_;
 
   // True iff the Chrome OS network library finished initialization.
   bool network_library_initialized_;
 
   // True iff ChromeOS webui login ui is ready.
   bool login_webui_ready_;
 
   // ID of automation channel.
   std::string channel_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_H_