| 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 | 167 |
| 168 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 168 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 169 command_line->AppendSwitch(switches::kEnableProfileShortcutManager); | 169 command_line->AppendSwitch(switches::kEnableProfileShortcutManager); |
| 170 } | 170 } |
| 171 | 171 |
| 172 private: | 172 private: |
| 173 DISALLOW_COPY_AND_ASSIGN(BrowserTestWithProfileShortcutManager); | 173 DISALLOW_COPY_AND_ASSIGN(BrowserTestWithProfileShortcutManager); |
| 174 }; | 174 }; |
| 175 | 175 |
| 176 // Check that the window properties on Windows are properly set. | 176 // Check that the window properties on Windows are properly set. |
| 177 // http://crbug.com/396344 |
| 177 IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager, | 178 IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager, |
| 178 WindowProperties) { | 179 DISABLED_WindowProperties) { |
| 179 // Disable this test in Metro+Ash where Windows window properties aren't used. | 180 // Disable this test in Metro+Ash where Windows window properties aren't used. |
| 180 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 181 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
| 181 return; | 182 return; |
| 182 | 183 |
| 183 // This test checks HWND properties that are only available on Win7+. | 184 // This test checks HWND properties that are only available on Win7+. |
| 184 if (base::win::GetVersion() < base::win::VERSION_WIN7) | 185 if (base::win::GetVersion() < base::win::VERSION_WIN7) |
| 185 return; | 186 return; |
| 186 | 187 |
| 187 // Single profile case. The profile name should not be shown. | 188 // Single profile case. The profile name should not be shown. |
| 188 WaitAndValidateBrowserWindowProperties(base::Bind( | 189 WaitAndValidateBrowserWindowProperties(base::Bind( |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) { | 258 for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) { |
| 258 if (*it != browser()) | 259 if (*it != browser()) |
| 259 app_browser = *it; | 260 app_browser = *it; |
| 260 } | 261 } |
| 261 ASSERT_TRUE(app_browser); | 262 ASSERT_TRUE(app_browser); |
| 262 ASSERT_TRUE(app_browser != browser()); | 263 ASSERT_TRUE(app_browser != browser()); |
| 263 | 264 |
| 264 WaitAndValidateBrowserWindowProperties( | 265 WaitAndValidateBrowserWindowProperties( |
| 265 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); | 266 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); |
| 266 } | 267 } |
| OLD | NEW |