OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "chrome/browser/devtools/devtools_window_testing.h" | 9 #include "chrome/browser/devtools/devtools_window_testing.h" |
10 #include "chrome/browser/extensions/extension_browsertest.h" | 10 #include "chrome/browser/extensions/extension_browsertest.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 const Extension* app = InstallExtensionWithSourceAndFlags( | 53 const Extension* app = InstallExtensionWithSourceAndFlags( |
54 test_data_dir_.AppendASCII(app_folder), 1, | 54 test_data_dir_.AppendASCII(app_folder), 1, |
55 extensions::Manifest::INTERNAL, | 55 extensions::Manifest::INTERNAL, |
56 is_bookmark_app ? extensions::Extension::FROM_BOOKMARK | 56 is_bookmark_app ? extensions::Extension::FROM_BOOKMARK |
57 : extensions::Extension::NO_FLAGS); | 57 : extensions::Extension::NO_FLAGS); |
58 ASSERT_TRUE(app); | 58 ASSERT_TRUE(app); |
59 | 59 |
60 // Launch it in a window. | 60 // Launch it in a window. |
61 ASSERT_TRUE(OpenApplication(AppLaunchParams( | 61 ASSERT_TRUE(OpenApplication(AppLaunchParams( |
62 browser()->profile(), app, extensions::LAUNCH_CONTAINER_WINDOW, | 62 browser()->profile(), app, extensions::LAUNCH_CONTAINER_WINDOW, |
63 NEW_WINDOW, extensions::SOURCE_TEST))); | 63 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST))); |
64 | 64 |
65 for (auto* b : *BrowserList::GetInstance()) { | 65 for (auto* b : *BrowserList::GetInstance()) { |
66 if (b == browser()) | 66 if (b == browser()) |
67 continue; | 67 continue; |
68 | 68 |
69 std::string browser_app_id = | 69 std::string browser_app_id = |
70 web_app::GetExtensionIdFromApplicationName(b->app_name()); | 70 web_app::GetExtensionIdFromApplicationName(b->app_name()); |
71 if (browser_app_id == app->id()) { | 71 if (browser_app_id == app->id()) { |
72 app_browser_ = b; | 72 app_browser_ = b; |
73 break; | 73 break; |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 const Extension* bookmark_app = InstallExtensionWithSourceAndFlags( | 192 const Extension* bookmark_app = InstallExtensionWithSourceAndFlags( |
193 test_data_dir_.AppendASCII("app"), | 193 test_data_dir_.AppendASCII("app"), |
194 1, | 194 1, |
195 extensions::Manifest::INTERNAL, | 195 extensions::Manifest::INTERNAL, |
196 extensions::Extension::FROM_BOOKMARK); | 196 extensions::Extension::FROM_BOOKMARK); |
197 ASSERT_TRUE(bookmark_app); | 197 ASSERT_TRUE(bookmark_app); |
198 | 198 |
199 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. | 199 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. |
200 WebContents* bookmark_app_window = OpenApplication(AppLaunchParams( | 200 WebContents* bookmark_app_window = OpenApplication(AppLaunchParams( |
201 browser()->profile(), bookmark_app, extensions::LAUNCH_CONTAINER_WINDOW, | 201 browser()->profile(), bookmark_app, extensions::LAUNCH_CONTAINER_WINDOW, |
202 NEW_WINDOW, extensions::SOURCE_UNTRACKED)); | 202 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_UNTRACKED)); |
203 ASSERT_TRUE(bookmark_app_window); | 203 ASSERT_TRUE(bookmark_app_window); |
204 | 204 |
205 // Load a packaged app. | 205 // Load a packaged app. |
206 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("packaged_app"))); | 206 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("packaged_app"))); |
207 const Extension* packaged_app = nullptr; | 207 const Extension* packaged_app = nullptr; |
208 extensions::ExtensionRegistry* registry = | 208 extensions::ExtensionRegistry* registry = |
209 extensions::ExtensionRegistry::Get(browser()->profile()); | 209 extensions::ExtensionRegistry::Get(browser()->profile()); |
210 for (const scoped_refptr<const extensions::Extension>& extension : | 210 for (const scoped_refptr<const extensions::Extension>& extension : |
211 registry->enabled_extensions()) { | 211 registry->enabled_extensions()) { |
212 if (extension->name() == "Packaged App Test") | 212 if (extension->name() == "Packaged App Test") |
213 packaged_app = extension.get(); | 213 packaged_app = extension.get(); |
214 } | 214 } |
215 ASSERT_TRUE(packaged_app); | 215 ASSERT_TRUE(packaged_app); |
216 | 216 |
217 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. | 217 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. |
218 WebContents* packaged_app_window = OpenApplication(AppLaunchParams( | 218 WebContents* packaged_app_window = OpenApplication(AppLaunchParams( |
219 browser()->profile(), packaged_app, extensions::LAUNCH_CONTAINER_WINDOW, | 219 browser()->profile(), packaged_app, extensions::LAUNCH_CONTAINER_WINDOW, |
220 NEW_WINDOW, extensions::SOURCE_UNTRACKED)); | 220 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_UNTRACKED)); |
221 ASSERT_TRUE(packaged_app_window); | 221 ASSERT_TRUE(packaged_app_window); |
222 | 222 |
223 DevToolsWindow* devtools_window = | 223 DevToolsWindow* devtools_window = |
224 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); | 224 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); |
225 | 225 |
226 // The launch should have created a new app browser and a dev tools browser. | 226 // The launch should have created a new app browser and a dev tools browser. |
227 ASSERT_EQ(4u, chrome::GetBrowserCount(browser()->profile())); | 227 ASSERT_EQ(4u, chrome::GetBrowserCount(browser()->profile())); |
228 | 228 |
229 // Find the new browsers. | 229 // Find the new browsers. |
230 Browser* bookmark_app_browser = nullptr; | 230 Browser* bookmark_app_browser = nullptr; |
(...skipping 26 matching lines...) Expand all Loading... |
257 #else | 257 #else |
258 const bool kIsAsh = false; | 258 const bool kIsAsh = false; |
259 #endif // USE_ASH | 259 #endif // USE_ASH |
260 EXPECT_EQ(kIsAsh, bookmark_app_browser->SupportsWindowFeature( | 260 EXPECT_EQ(kIsAsh, bookmark_app_browser->SupportsWindowFeature( |
261 Browser::FEATURE_WEBAPPFRAME)); | 261 Browser::FEATURE_WEBAPPFRAME)); |
262 EXPECT_FALSE(packaged_app_browser->SupportsWindowFeature( | 262 EXPECT_FALSE(packaged_app_browser->SupportsWindowFeature( |
263 Browser::FEATURE_WEBAPPFRAME)); | 263 Browser::FEATURE_WEBAPPFRAME)); |
264 | 264 |
265 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window); | 265 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window); |
266 } | 266 } |
OLD | NEW |