OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <shlobj.h> // Must be before propkey. | 7 #include <shlobj.h> // Must be before propkey. |
8 #include <propkey.h> | 8 #include <propkey.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 | 10 |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 // The second profile's name should be part of the relaunch name. | 217 // The second profile's name should be part of the relaunch name. |
218 Browser* profile2_browser = | 218 Browser* profile2_browser = |
219 CreateBrowser(profile_manager->GetProfileByPath(path_profile2)); | 219 CreateBrowser(profile_manager->GetProfileByPath(path_profile2)); |
220 size_t profile2_index = cache.GetIndexOfProfileWithPath(path_profile2); | 220 size_t profile2_index = cache.GetIndexOfProfileWithPath(path_profile2); |
221 WaitAndValidateBrowserWindowProperties( | 221 WaitAndValidateBrowserWindowProperties( |
222 base::Bind(&ValidateBrowserWindowProperties, | 222 base::Bind(&ValidateBrowserWindowProperties, |
223 profile2_browser, | 223 profile2_browser, |
224 cache.GetNameOfProfileAtIndex(profile2_index))); | 224 cache.GetNameOfProfileAtIndex(profile2_index))); |
225 } | 225 } |
226 | 226 |
227 IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, HostedApp) { | 227 // http://crbug.com/396344 |
| 228 IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, DISABLED_HostedApp) { |
228 #if defined(USE_ASH) | 229 #if defined(USE_ASH) |
229 // Disable this test in Metro+Ash where Windows window properties aren't used. | 230 // Disable this test in Metro+Ash where Windows window properties aren't used. |
230 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 231 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
231 return; | 232 return; |
232 #endif | 233 #endif |
233 | 234 |
234 // This test checks HWND properties that are only available on Win7+. | 235 // This test checks HWND properties that are only available on Win7+. |
235 if (base::win::GetVersion() < base::win::VERSION_WIN7) | 236 if (base::win::GetVersion() < base::win::VERSION_WIN7) |
236 return; | 237 return; |
237 | 238 |
(...skipping 18 matching lines...) Expand all Loading... |
256 for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) { | 257 for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) { |
257 if (*it != browser()) | 258 if (*it != browser()) |
258 app_browser = *it; | 259 app_browser = *it; |
259 } | 260 } |
260 ASSERT_TRUE(app_browser); | 261 ASSERT_TRUE(app_browser); |
261 ASSERT_TRUE(app_browser != browser()); | 262 ASSERT_TRUE(app_browser != browser()); |
262 | 263 |
263 WaitAndValidateBrowserWindowProperties( | 264 WaitAndValidateBrowserWindowProperties( |
264 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); | 265 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); |
265 } | 266 } |
OLD | NEW |