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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "apps/launcher.h" | 7 #include "apps/launcher.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1239 while (!router->ExtensionHasEventListener( | 1239 while (!router->ExtensionHasEventListener( |
1240 file_manager->id(), app_runtime::OnLaunched::kEventName)) { | 1240 file_manager->id(), app_runtime::OnLaunched::kEventName)) { |
1241 content::RunAllPendingInMessageLoop(); | 1241 content::RunAllPendingInMessageLoop(); |
1242 } | 1242 } |
1243 | 1243 |
1244 // Listen for new app windows so we see the file manager app launch itself. | 1244 // Listen for new app windows so we see the file manager app launch itself. |
1245 AppWindowRegistry* registry = AppWindowRegistry::Get(incognito_profile); | 1245 AppWindowRegistry* registry = AppWindowRegistry::Get(incognito_profile); |
1246 ASSERT_TRUE(registry != NULL); | 1246 ASSERT_TRUE(registry != NULL); |
1247 registry->AddObserver(this); | 1247 registry->AddObserver(this); |
1248 | 1248 |
1249 OpenApplication(AppLaunchParams(incognito_profile, file_manager, CURRENT_TAB, | 1249 OpenApplication(CreateAppLaunchParamsUserContainer( |
1250 chrome::HOST_DESKTOP_TYPE_NATIVE, | 1250 incognito_profile, file_manager, NEW_FOREGROUND_TAB, |
1251 extensions::SOURCE_TEST)); | 1251 extensions::SOURCE_TEST)); |
1252 | 1252 |
1253 while (!ContainsKey(opener_app_ids_, file_manager->id())) { | 1253 while (!ContainsKey(opener_app_ids_, file_manager->id())) { |
1254 content::RunAllPendingInMessageLoop(); | 1254 content::RunAllPendingInMessageLoop(); |
1255 } | 1255 } |
1256 } | 1256 } |
1257 | 1257 |
1258 class RestartDeviceTest : public PlatformAppBrowserTest { | 1258 class RestartDeviceTest : public PlatformAppBrowserTest { |
1259 public: | 1259 public: |
1260 RestartDeviceTest() | 1260 RestartDeviceTest() |
1261 : power_manager_client_(NULL), | 1261 : power_manager_client_(NULL), |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1378 // Now check that the app window's default zoom, and actual zoom level, | 1378 // Now check that the app window's default zoom, and actual zoom level, |
1379 // have not been changed from the default. | 1379 // have not been changed from the default. |
1380 WebContents* web_contents = GetFirstAppWindowWebContents(); | 1380 WebContents* web_contents = GetFirstAppWindowWebContents(); |
1381 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( | 1381 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( |
1382 web_contents->GetSiteInstance()); | 1382 web_contents->GetSiteInstance()); |
1383 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); | 1383 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); |
1384 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); | 1384 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); |
1385 } | 1385 } |
1386 | 1386 |
1387 } // namespace extensions | 1387 } // namespace extensions |
OLD | NEW |