| 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. | |
| 8 #include <propkey.h> | 7 #include <propkey.h> |
| 9 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 #include <shlobj.h> // Must be before propkey. |
| 10 | 10 |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/strings/string16.h" | 12 #include "base/strings/string16.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "base/win/scoped_comptr.h" | 14 #include "base/win/scoped_comptr.h" |
| 15 #include "base/win/scoped_propvariant.h" | 15 #include "base/win/scoped_propvariant.h" |
| 16 #include "base/win/windows_version.h" | 16 #include "base/win/windows_version.h" |
| 17 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
| 18 #include "chrome/browser/extensions/extension_browsertest.h" | 18 #include "chrome/browser/extensions/extension_browsertest.h" |
| 19 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| (...skipping 238 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 |