Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Side by Side Diff: chrome/browser/apps/app_browsertest.cc

Issue 2729253005: Fix PlatformAppBrowserTest.AppWindowIframe. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <memory> 7 #include <memory>
8 8
9 #include "apps/launcher.h" 9 #include "apps/launcher.h"
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after
1353 1353
1354 // Now check that the app window's default zoom, and actual zoom level, 1354 // Now check that the app window's default zoom, and actual zoom level,
1355 // have not been changed from the default. 1355 // have not been changed from the default.
1356 WebContents* web_contents = GetFirstAppWindowWebContents(); 1356 WebContents* web_contents = GetFirstAppWindowWebContents();
1357 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( 1357 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get(
1358 web_contents->GetSiteInstance()); 1358 web_contents->GetSiteInstance());
1359 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); 1359 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel());
1360 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); 1360 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents));
1361 } 1361 }
1362 1362
1363 // This test will flake until we fix the underlying issue:
1364 // https://crbug.com/620194.
1365 #define MAYBE_AppWindowIframe DISABLED_AppWindowIframe
1366 // Sends chrome.test.sendMessage from chrome.app.window.create's callback. 1363 // Sends chrome.test.sendMessage from chrome.app.window.create's callback.
1367 // The app window also adds an <iframe> to the page during window.onload. 1364 // The app window also adds an <iframe> to the page during window.onload.
1368 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_AppWindowIframe) { 1365 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWindowIframe) {
1369 LoadAndLaunchPlatformApp("app_window_send_message", 1366 LoadAndLaunchPlatformApp("app_window_send_message",
1370 "APP_WINDOW_CREATE_CALLBACK"); 1367 "APP_WINDOW_CREATE_CALLBACK");
1371 } 1368 }
1372 1369
1373 } // namespace extensions 1370 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698