| 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 "chrome/browser/ui/views/location_bar/star_view.h" | 5 #include "chrome/browser/ui/views/location_bar/star_view.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 HWND* child = reinterpret_cast<HWND*>(l_param); | 81 HWND* child = reinterpret_cast<HWND*>(l_param); |
| 82 *child = hwnd; | 82 *child = hwnd; |
| 83 // The first child window is the plugin, then its children. So stop | 83 // The first child window is the plugin, then its children. So stop |
| 84 // enumerating after the first callback. | 84 // enumerating after the first callback. |
| 85 return FALSE; | 85 return FALSE; |
| 86 } | 86 } |
| 87 | 87 |
| 88 // Ensure that UIs like the star window, user profiler picker, omnibox | 88 // Ensure that UIs like the star window, user profiler picker, omnibox |
| 89 // popup and bookmark editor are always over a windowed NPAPI plugin even if | 89 // popup and bookmark editor are always over a windowed NPAPI plugin even if |
| 90 // kDisableDwmComposition is used. | 90 // kDisableDwmComposition is used. |
| 91 IN_PROC_BROWSER_TEST_F(StarViewTestNoDWM, WindowedNPAPIPluginHidden) { | 91 // flaky: http://crbug.com/406631 |
| 92 IN_PROC_BROWSER_TEST_F(StarViewTestNoDWM, DISABLED_WindowedNPAPIPluginHidden) { |
| 92 browser()->profile()->GetPrefs()->SetBoolean(prefs::kPluginsAlwaysAuthorize, | 93 browser()->profile()->GetPrefs()->SetBoolean(prefs::kPluginsAlwaysAuthorize, |
| 93 true); | 94 true); |
| 94 | 95 |
| 95 // First switch to a new tab and back, to also test a scenario where we | 96 // First switch to a new tab and back, to also test a scenario where we |
| 96 // stopped watching the root window. | 97 // stopped watching the root window. |
| 97 ui_test_utils::NavigateToURLWithDisposition( | 98 ui_test_utils::NavigateToURLWithDisposition( |
| 98 browser(), GURL("about:blank"), NEW_FOREGROUND_TAB, | 99 browser(), GURL("about:blank"), NEW_FOREGROUND_TAB, |
| 99 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 100 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
| 100 browser()->tab_strip_model()->ActivateTabAt(0, true); | 101 browser()->tab_strip_model()->ActivateTabAt(0, true); |
| 101 | 102 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 region_before.left == region_after.left && | 155 region_before.left == region_after.left && |
| 155 region_before.top == region_after.top && | 156 region_before.top == region_after.top && |
| 156 region_before.right == region_after.right && | 157 region_before.right == region_after.right && |
| 157 region_before.bottom == region_after.bottom; | 158 region_before.bottom == region_after.bottom; |
| 158 ASSERT_FALSE(rects_equal); | 159 ASSERT_FALSE(rects_equal); |
| 159 } | 160 } |
| 160 | 161 |
| 161 #endif | 162 #endif |
| 162 | 163 |
| 163 } // namespace | 164 } // namespace |
| OLD | NEW |