GTTF: next batch of automation separation.

chrome/browser/automation/automation_provider.h

 // Copyright (c) 2010 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 149 matching lines @@
   friend class PopupMenuWaiter;
   virtual ~AutomationProvider();
 
   // Helper function to find the browser window that contains a given
   // NavigationController and activate that tab.
   // Returns the Browser if found.
   Browser* FindAndActivateTab(NavigationController* contents);
 
   scoped_ptr<AutomationBrowserTracker> browser_tracker_;
   scoped_ptr<AutomationTabTracker> tab_tracker_;
+  scoped_ptr<AutomationWindowTracker> window_tracker_;
 
   typedef std::map<NavigationController*, LoginHandler*> LoginHandlerMap;
   LoginHandlerMap login_handler_map_;
 
   Profile* profile_;
 
   // A pointer to reply message used when we do asynchronous processing in the
   // message handler.
   // TODO(phajdan.jr): Remove |reply_message_|, it is error-prone.
   IPC::Message* reply_message_;
 
   // Consumer for asynchronous history queries.
   CancelableRequestConsumer consumer_;
 
  private:
   // IPC Message callbacks.
-  void GetBrowserLocale(string16* locale);
   void GetShowingAppModalDialog(bool* showing_dialog, int* dialog_button);
   void ClickAppModalDialogButton(int button, bool* success);
   void ShutdownSessionService(int handle, bool* result);
-  // Be aware that the browser window returned might be of non TYPE_NORMAL
-  // or in incognito mode.
-  void GetBrowserWindow(int index, int* handle);
-  void FindNormalBrowserWindow(int* handle);
-  void GetLastActiveBrowserWindow(int* handle);
-  void GetActiveWindow(int* handle);
-  void ExecuteBrowserCommandAsync(int handle, int command, bool* success);
-  void ExecuteBrowserCommand(int handle, int command,
-                             IPC::Message* reply_message);
   void TerminateSession(int handle, bool* success);
   void WindowGetViewBounds(int handle, int view_id, bool screen_coordinates,
                            bool* success, gfx::Rect* bounds);
   void WindowSimulateDrag(int handle,
                           std::vector<gfx::Point> drag_path,
                           int flags,
                           bool press_escape_en_route,
                           IPC::Message* reply_message);
   void WindowSimulateClick(const IPC::Message& message,
                            int handle,
                            const gfx::Point& click,
                            int flags);
   void WindowSimulateMouseMove(const IPC::Message& message,
                                int handle,
                                const gfx::Point& location);
   void WindowSimulateKeyPress(const IPC::Message& message,
                               int handle,
                               int key,
                               int flags);
   void GetWindowBounds(int handle, gfx::Rect* bounds, bool* result);
   void SetWindowBounds(int handle, const gfx::Rect& bounds, bool* result);
   void SetWindowVisible(int handle, bool visible, bool* result);
-  void IsWindowActive(int handle, bool* success, bool* is_active);
-  void ActivateWindow(int handle);
-  void IsWindowMaximized(int handle, bool* is_maximized, bool* success);
 
   void GetTabCount(int handle, int* tab_count);
   void GetType(int handle, int* type_as_int);
   void GetTab(int win_handle, int tab_index, int* tab_handle);
 #if defined(OS_WIN)
   // TODO(port): Replace HWND.
   void GetTabHWND(int handle, HWND* tab_hwnd);
 #endif  // defined(OS_WIN)
   void GetTabProcessID(int handle, int* process_id);
   void GetTabTitle(int handle, int* title_string_size, std::wstring* title);
@@ skipping 679 matching lines @@
   scoped_ptr<IPC::ChannelProxy> channel_;
   scoped_ptr<InitialLoadObserver> initial_load_observer_;
   scoped_ptr<NotificationObserver> new_tab_ui_load_observer_;
   scoped_ptr<NotificationObserver> find_in_page_observer_;
   scoped_ptr<NotificationObserver> dom_operation_observer_;
   scoped_ptr<NotificationObserver> dom_inspector_observer_;
   scoped_ptr<ExtensionTestResultNotificationObserver>
       extension_test_result_observer_;
   scoped_ptr<MetricEventDurationObserver> metric_event_duration_observer_;
   scoped_ptr<AutomationExtensionTracker> extension_tracker_;
-  scoped_ptr<AutomationWindowTracker> window_tracker_;
   scoped_ptr<AutomationAutocompleteEditTracker> autocomplete_edit_tracker_;
   scoped_ptr<NavigationControllerRestoredObserver> restore_tracker_;
   PortContainerMap port_containers_;
   NotificationObserverList notification_observer_list_;
   scoped_refptr<AutomationResourceMessageFilter>
       automation_resource_message_filter_;
 
   // Keep track of whether a popup menu has been opened since the last time
   // that StartTrackingPopupMenus has been called.
   bool popup_menu_opened_;
 
   // A temporary object that receives a notification when a popup menu opens.
   PopupMenuWaiter* popup_menu_waiter_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_H_