[chromedriver] Fix 3 bugs about web view, window handle and target window.

chrome/test/chromedriver/chrome/chrome_impl.h

 // Copyright (c) 2012 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_CHROMEDRIVER_CHROME_CHROME_IMPL_H_
 #define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 13 matching lines @@
 
 class ChromeImpl : public Chrome, public WebViewDelegate {
  public:
   ChromeImpl(URLRequestContextGetter* context_getter,
              int port,
              const SyncWebSocketFactory& socket_factory);
   virtual ~ChromeImpl();
 
   // Overridden from Chrome:
   virtual std::string GetVersion() OVERRIDE;
-  virtual Status GetWebViews(std::list<WebView*>* web_views) OVERRIDE;
+  virtual Status GetWebViewIds(std::list<std::string>* web_view_ids) OVERRIDE;
+  virtual Status GetWebViewById(const std::string& id,
+                                WebView** web_view) OVERRIDE;
   virtual Status IsJavaScriptDialogOpen(bool* is_open) OVERRIDE;
   virtual Status GetJavaScriptDialogMessage(std::string* message) OVERRIDE;
   virtual Status HandleJavaScriptDialog(
       bool accept,
       const std::string& prompt_text) OVERRIDE;
 
   // Overridden from WebViewDelegate:
   virtual void OnWebViewClose(WebView* web_view) OVERRIDE;
 
  protected:
   Status Init();
   int GetPort() const;
 
  private:
   typedef std::map<std::string, linked_ptr<WebViewImpl> > WebViewMap;
 
   Status GetDialogManagerForOpenDialog(JavaScriptDialogManager** manager);
   Status ParseAndCheckVersion(const std::string& version);
 
   scoped_refptr<URLRequestContextGetter> context_getter_;
   int port_;
   SyncWebSocketFactory socket_factory_;
   std::string version_;
   int build_no_;
   WebViewMap web_view_map_;
+  // Ids in this list are in the same order as the window opened.

[chrisgao (Use stgao instead), 2013/03/22 23:29:46]

window->web view

+  std::list<std::string> web_view_ids_;
 };
 
 namespace internal {
 
 struct WebViewInfo {
   enum Type {
     kPage,
     kOther
   };
 
@@ skipping 12 matching lines @@
 
 Status ParsePagesInfo(const std::string& data,
                       std::list<WebViewInfo>* info_list);
 
 Status ParseVersionInfo(const std::string& data,
                         std::string* version);
 
 }  // namespace internal
 
 #endif  // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_