diff options
| author | bustamante@chromium.org <bustamante@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 09:16:59 +0000 |
|---|---|---|
| committer | bustamante@chromium.org <bustamante@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 09:16:59 +0000 |
| commit | 84a21ae8d3e5d09ca46977296df30a89defe117d (patch) | |
| tree | 16ee0e5ec72b7f00438f7ad209b05976f6ef1db5 | |
| parent | 7f9267559fa8735a6451851613197ba74d68ad59 (diff) | |
| download | chromium_src-84a21ae8d3e5d09ca46977296df30a89defe117d.zip chromium_src-84a21ae8d3e5d09ca46977296df30a89defe117d.tar.gz chromium_src-84a21ae8d3e5d09ca46977296df30a89defe117d.tar.bz2 | |
Ignore generated background windows in GetWebViewIds for affected builds on M33
BUG=
Review URL: https://codereview.chromium.org/148283009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247913 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/chromedriver/chrome/chrome_impl.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/test/chromedriver/chrome/chrome_impl.cc b/chrome/test/chromedriver/chrome/chrome_impl.cc index f293899e..9da612b 100644 --- a/chrome/test/chromedriver/chrome/chrome_impl.cc +++ b/chrome/test/chromedriver/chrome/chrome_impl.cc @@ -56,7 +56,17 @@ Status ChromeImpl::GetWebViewIds(std::list<std::string>* web_view_ids) { // Check for newly-opened web views. for (size_t i = 0; i < views_info.GetSize(); ++i) { const WebViewInfo& view = views_info.Get(i); - if (view.type != WebViewInfo::kPage) + if (view.type != WebViewInfo::kPage && view.type != WebViewInfo::kApp) + continue; + + // Workaround to ignore generated background pages that are + // being returned as active windows for some builds of Chrome. + // TODO(bustamante): Once Chrome builds < 1755 are no longer + // supported this check can be removed. + int kBuildNumber = GetBuildNo(); + if (kBuildNumber > 1704 && kBuildNumber < 1755 && + view.type == WebViewInfo::kApp && + view.url.find("_generated_background") != std::string::npos) continue; bool found = false; |