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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 } | 158 } |
159 | 159 |
160 } // namespace | 160 } // namespace |
161 | 161 |
162 // Tests that require the profile shortcut manager to be instantiated despite | 162 // Tests that require the profile shortcut manager to be instantiated despite |
163 // having --user-data-dir specified. | 163 // having --user-data-dir specified. |
164 class BrowserTestWithProfileShortcutManager : public InProcessBrowserTest { | 164 class BrowserTestWithProfileShortcutManager : public InProcessBrowserTest { |
165 public: | 165 public: |
166 BrowserTestWithProfileShortcutManager() {} | 166 BrowserTestWithProfileShortcutManager() {} |
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 // http://crbug.com/396344 |
178 IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager, | 178 IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager, |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) { | 258 for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) { |
259 if (*it != browser()) | 259 if (*it != browser()) |
260 app_browser = *it; | 260 app_browser = *it; |
261 } | 261 } |
262 ASSERT_TRUE(app_browser); | 262 ASSERT_TRUE(app_browser); |
263 ASSERT_TRUE(app_browser != browser()); | 263 ASSERT_TRUE(app_browser != browser()); |
264 | 264 |
265 WaitAndValidateBrowserWindowProperties( | 265 WaitAndValidateBrowserWindowProperties( |
266 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); | 266 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); |
267 } | 267 } |
OLD | NEW |