Take 2 at this. The only change between this and the first is to add the GetT...

chrome/test/automation/browser_proxy.h

Index: chrome/test/automation/browser_proxy.h
===================================================================
--- chrome/test/automation/browser_proxy.h	(revision 30237)
+++ chrome/test/automation/browser_proxy.h	(working copy)
@@ -31,6 +31,13 @@
 // 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)
@@ -84,6 +91,10 @@
   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;
+
   // Returns the TabProxy for the tab at the given index, transferring
   // ownership of the pointer to the caller. On failure, returns NULL.
   //