| 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 plugin_hwnd = NULL; | 161 plugin_hwnd = NULL; |
| 162 return FALSE; | 162 return FALSE; |
| 163 } | 163 } |
| 164 *plugin_hwnd = hwnd; | 164 *plugin_hwnd = hwnd; |
| 165 return TRUE; | 165 return TRUE; |
| 166 } | 166 } |
| 167 | 167 |
| 168 // Tests that hiding/showing the parent frame hides/shows the plugin. | 168 // Tests that hiding/showing the parent frame hides/shows the plugin. |
| 169 // Fails for WIN. http://crbug.com/111601 | 169 // Fails for WIN. http://crbug.com/111601 |
| 170 #if defined(OS_WIN) | 170 #if defined(OS_WIN) |
| 171 #define MAYBE_PluginVisibilty FAILS_PluginVisibilty | 171 #define MAYBE_PluginVisibilty DISABLED_PluginVisibilty |
| 172 #else | 172 #else |
| 173 #define MAYBE_PluginVisibilty PluginVisibilty | 173 #define MAYBE_PluginVisibilty PluginVisibilty |
| 174 #endif | 174 #endif |
| 175 | 175 |
| 176 TEST_F(PluginTest, MAYBE_PluginVisibilty) { | 176 TEST_F(PluginTest, MAYBE_PluginVisibilty) { |
| 177 FilePath test_html = data_dir_; | 177 FilePath test_html = data_dir_; |
| 178 test_html = test_html.AppendASCII(kPluginsDir); | 178 test_html = test_html.AppendASCII(kPluginsDir); |
| 179 test_html = test_html.AppendASCII("plugin_visibility.html"); | 179 test_html = test_html.AppendASCII("plugin_visibility.html"); |
| 180 test_shell_->LoadFile(test_html); | 180 test_shell_->LoadFile(test_html); |
| 181 test_shell_->WaitTestFinished(); | 181 test_shell_->WaitTestFinished(); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 192 ASSERT_TRUE(IsWindowVisible(plugin_hwnd)); | 192 ASSERT_TRUE(IsWindowVisible(plugin_hwnd)); |
| 193 | 193 |
| 194 main_frame->executeScript(WebString::fromUTF8("showFrame(false)")); | 194 main_frame->executeScript(WebString::fromUTF8("showFrame(false)")); |
| 195 ASSERT_FALSE(IsWindowVisible(plugin_hwnd)); | 195 ASSERT_FALSE(IsWindowVisible(plugin_hwnd)); |
| 196 | 196 |
| 197 main_frame->executeScript(WebString::fromUTF8("showFrame(true)")); | 197 main_frame->executeScript(WebString::fromUTF8("showFrame(true)")); |
| 198 ASSERT_TRUE(IsWindowVisible(plugin_hwnd)); | 198 ASSERT_TRUE(IsWindowVisible(plugin_hwnd)); |
| 199 } | 199 } |
| 200 #endif | 200 #endif |
| 201 #endif //!ARCH_CPU_64_BITS | 201 #endif //!ARCH_CPU_64_BITS |
| OLD | NEW |