| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 } | 320 } |
| 321 | 321 |
| 322 // Now activate the tab and verify that the plugin painted. | 322 // Now activate the tab and verify that the plugin painted. |
| 323 browser()->tab_strip_model()->ActivateTabAt(1, true); | 323 browser()->tab_strip_model()->ActivateTabAt(1, true); |
| 324 | 324 |
| 325 base::string16 expected_title2(base::ASCIIToUTF16("shown")); | 325 base::string16 expected_title2(base::ASCIIToUTF16("shown")); |
| 326 content::TitleWatcher title_watcher2(tab, expected_title2); | 326 content::TitleWatcher title_watcher2(tab, expected_title2); |
| 327 EXPECT_EQ(expected_title2, title_watcher2.WaitAndGetTitle()); | 327 EXPECT_EQ(expected_title2, title_watcher2.WaitAndGetTitle()); |
| 328 | 328 |
| 329 HWND child = NULL; | 329 HWND child = NULL; |
| 330 HWND hwnd = tab->GetView()->GetNativeView()->GetDispatcher()->host()-> | 330 HWND hwnd = |
| 331 GetAcceleratedWidget(); | 331 tab->GetView()->GetNativeView()->GetHost()->GetAcceleratedWidget(); |
| 332 EnumChildWindows(hwnd, EnumerateChildren,reinterpret_cast<LPARAM>(&child)); | 332 EnumChildWindows(hwnd, EnumerateChildren,reinterpret_cast<LPARAM>(&child)); |
| 333 | 333 |
| 334 RECT region; | 334 RECT region; |
| 335 int result = GetWindowRgnBox(child, ®ion); | 335 int result = GetWindowRgnBox(child, ®ion); |
| 336 ASSERT_NE(result, NULLREGION); | 336 ASSERT_NE(result, NULLREGION); |
| 337 } | 337 } |
| 338 | 338 |
| 339 #endif | 339 #endif |
| OLD | NEW |