| 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 "apps/launcher.h" | 5 #include "apps/launcher.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1034 ASSERT_TRUE(should_install.seen()); | 1034 ASSERT_TRUE(should_install.seen()); |
| 1035 | 1035 |
| 1036 ExtensionTestMessageListener launched_listener("Launched", false); | 1036 ExtensionTestMessageListener launched_listener("Launched", false); |
| 1037 OpenApplication(AppLaunchParams(browser()->profile(), extension, | 1037 OpenApplication(AppLaunchParams(browser()->profile(), extension, |
| 1038 LAUNCH_CONTAINER_NONE, NEW_WINDOW, | 1038 LAUNCH_CONTAINER_NONE, NEW_WINDOW, |
| 1039 extensions::SOURCE_TEST)); | 1039 extensions::SOURCE_TEST)); |
| 1040 | 1040 |
| 1041 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); | 1041 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); |
| 1042 } | 1042 } |
| 1043 | 1043 |
| 1044 // Disabled due to flakiness. http://crbug.com/468609 |
| 1044 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | 1045 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, |
| 1045 ComponentExtensionRuntimeReload) { | 1046 DISABLED_ComponentExtensionRuntimeReload) { |
| 1046 // Ensure that we wait until the background page is run (to register the | 1047 // Ensure that we wait until the background page is run (to register the |
| 1047 // OnLaunched listener) before trying to open the application. This is similar | 1048 // OnLaunched listener) before trying to open the application. This is similar |
| 1048 // to LoadAndLaunchPlatformApp, but we want to load as a component extension. | 1049 // to LoadAndLaunchPlatformApp, but we want to load as a component extension. |
| 1049 content::WindowedNotificationObserver app_loaded_observer( | 1050 content::WindowedNotificationObserver app_loaded_observer( |
| 1050 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, | 1051 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, |
| 1051 content::NotificationService::AllSources()); | 1052 content::NotificationService::AllSources()); |
| 1052 | 1053 |
| 1053 const Extension* extension = LoadExtensionAsComponent( | 1054 const Extension* extension = LoadExtensionAsComponent( |
| 1054 test_data_dir_.AppendASCII("platform_apps").AppendASCII("component")); | 1055 test_data_dir_.AppendASCII("platform_apps").AppendASCII("component")); |
| 1055 ASSERT_TRUE(extension); | 1056 ASSERT_TRUE(extension); |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1333 // Now check that the app window's default zoom, and actual zoom level, | 1334 // Now check that the app window's default zoom, and actual zoom level, |
| 1334 // have not been changed from the default. | 1335 // have not been changed from the default. |
| 1335 WebContents* web_contents = GetFirstAppWindowWebContents(); | 1336 WebContents* web_contents = GetFirstAppWindowWebContents(); |
| 1336 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( | 1337 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( |
| 1337 web_contents->GetSiteInstance()); | 1338 web_contents->GetSiteInstance()); |
| 1338 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); | 1339 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); |
| 1339 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); | 1340 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); |
| 1340 } | 1341 } |
| 1341 | 1342 |
| 1342 } // namespace extensions | 1343 } // namespace extensions |
| OLD | NEW |