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 #include <stddef.h> |
10 | 11 |
11 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/macros.h" |
12 #include "base/strings/string16.h" | 14 #include "base/strings/string16.h" |
13 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
14 #include "base/win/scoped_comptr.h" | 16 #include "base/win/scoped_comptr.h" |
15 #include "base/win/scoped_propvariant.h" | 17 #include "base/win/scoped_propvariant.h" |
16 #include "base/win/windows_version.h" | 18 #include "base/win/windows_version.h" |
17 #include "chrome/browser/browser_process.h" | 19 #include "chrome/browser/browser_process.h" |
18 #include "chrome/browser/extensions/extension_browsertest.h" | 20 #include "chrome/browser/extensions/extension_browsertest.h" |
19 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/profiles/profile_info_cache.h" | 22 #include "chrome/browser/profiles/profile_info_cache.h" |
21 #include "chrome/browser/profiles/profile_manager.h" | 23 #include "chrome/browser/profiles/profile_manager.h" |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) { | 265 for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) { |
264 if (*it != browser()) | 266 if (*it != browser()) |
265 app_browser = *it; | 267 app_browser = *it; |
266 } | 268 } |
267 ASSERT_TRUE(app_browser); | 269 ASSERT_TRUE(app_browser); |
268 ASSERT_TRUE(app_browser != browser()); | 270 ASSERT_TRUE(app_browser != browser()); |
269 | 271 |
270 WaitAndValidateBrowserWindowProperties( | 272 WaitAndValidateBrowserWindowProperties( |
271 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); | 273 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); |
272 } | 274 } |
OLD | NEW |