Changes ui proxy classes to use Browser::Types rather than copying...

chrome/test/automation/browser_proxy.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_TEST_AUTOMATION_BROWSER_PROXY_H_
 #define CHROME_TEST_AUTOMATION_BROWSER_PROXY_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 
+#include "chrome/browser/browser.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 
 class GURL;
 class TabProxy;
 class WindowProxy;
 class AutocompleteEditProxy;
 
 namespace gfx {
   class Point;
   class Rect;
 }
 
 // This class presents the interface to actions that can be performed on
 // a given browser window.  Note that this object can be invalidated at any
 // time if the corresponding browser window in the app is closed.  In that case,
 // any subsequent calls will return false immediately.
 class BrowserProxy : public AutomationResourceProxy {
  public:
-  enum Type {
-    TYPE_NORMAL = 0,
-    TYPE_POPUP = 1,
-    TYPE_APP = 2,
-    TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP,
-  };
-
   BrowserProxy(AutomationMessageSender* sender,
                AutomationHandleTracker* tracker,
                int handle)
     : AutomationResourceProxy(tracker, sender, handle) {}
 
   // Activates the tab corresponding to (zero-based) tab_index. Returns true if
   // successful.
   bool ActivateTab(int tab_index);
 
   // Like ActivateTab, but returns false if response is not received before
@@ skipping 35 matching lines @@
   // the call was successful.
   bool GetTabCount(int* num_tabs) const;
 
   // Like GetTabCount, but returns false if tab count is not received within the
   // before timeout.
   bool GetTabCountWithTimeout(int* num_tabs, uint32 timeout_ms,
                               bool* is_timeout) const;
 
   // Returns the type of the given window. Returns true if the call was
   // successful.
-  bool GetType(Type* type) const;
+  bool GetType(Browser::Type* type) const;
 
   // Returns the TabProxy for the tab at the given index, transferring
   // ownership of the pointer to the caller. On failure, returns NULL.
   //
   // Use GetTabCount to see how many windows you can ask for. Tab numbers
   // are 0-based.
   scoped_refptr<TabProxy> GetTab(int tab_index) const;
 
   // Returns the TabProxy for the currently active tab, transferring
   // ownership of the pointer to the caller. On failure, returns NULL.
@@ skipping 103 matching lines @@
   // mahine).
   bool TerminateSession();
 
  protected:
   virtual ~BrowserProxy() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_BROWSER_PROXY_H_