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 <objbase.h> | 5 #include <objbase.h> |
6 #include <shlobj.h> // Must be before propkey. | 6 #include <shlobj.h> // Must be before propkey. |
7 #include <propkey.h> | 7 #include <propkey.h> |
8 #include <shellapi.h> | 8 #include <shellapi.h> |
9 #include <stddef.h> | 9 #include <stddef.h> |
10 | 10 |
11 #include <string> | 11 #include <string> |
12 | 12 |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/message_loop/message_loop.h" |
15 #include "base/strings/string16.h" | 16 #include "base/strings/string16.h" |
16 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
17 #include "base/win/scoped_comptr.h" | 18 #include "base/win/scoped_comptr.h" |
18 #include "base/win/scoped_propvariant.h" | 19 #include "base/win/scoped_propvariant.h" |
19 #include "base/win/windows_version.h" | 20 #include "base/win/windows_version.h" |
20 #include "chrome/browser/browser_process.h" | 21 #include "chrome/browser/browser_process.h" |
21 #include "chrome/browser/extensions/extension_browsertest.h" | 22 #include "chrome/browser/extensions/extension_browsertest.h" |
22 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
23 #include "chrome/browser/profiles/profile_attributes_entry.h" | 24 #include "chrome/browser/profiles/profile_attributes_entry.h" |
24 #include "chrome/browser/profiles/profile_attributes_storage.h" | 25 #include "chrome/browser/profiles/profile_attributes_storage.h" |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 for (auto* b : *BrowserList::GetInstance()) { | 252 for (auto* b : *BrowserList::GetInstance()) { |
252 if (b != browser()) | 253 if (b != browser()) |
253 app_browser = b; | 254 app_browser = b; |
254 } | 255 } |
255 ASSERT_TRUE(app_browser); | 256 ASSERT_TRUE(app_browser); |
256 ASSERT_TRUE(app_browser != browser()); | 257 ASSERT_TRUE(app_browser != browser()); |
257 | 258 |
258 WaitAndValidateBrowserWindowProperties( | 259 WaitAndValidateBrowserWindowProperties( |
259 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); | 260 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); |
260 } | 261 } |
OLD | NEW |