Chromium Code Reviews| 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/ui/native_app_window.h" | 5 #include "apps/ui/native_app_window.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
| (...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 670 scoped_refptr<content::MessageLoopRunner> loop_runner( | 670 scoped_refptr<content::MessageLoopRunner> loop_runner( |
| 671 new content::MessageLoopRunner); | 671 new content::MessageLoopRunner); |
| 672 InterstitialObserver observer(web_contents, | 672 InterstitialObserver observer(web_contents, |
| 673 loop_runner->QuitClosure(), | 673 loop_runner->QuitClosure(), |
| 674 base::Closure()); | 674 base::Closure()); |
| 675 if (!content::InterstitialPage::GetInterstitialPage(web_contents)) | 675 if (!content::InterstitialPage::GetInterstitialPage(web_contents)) |
| 676 loop_runner->Run(); | 676 loop_runner->Run(); |
| 677 } | 677 } |
| 678 | 678 |
| 679 void LoadAppWithGuest(const std::string& app_path) { | 679 void LoadAppWithGuest(const std::string& app_path) { |
| 680 | |
|
lazyboy
2014/07/07 21:34:44
Revert this change?
Fady Samuel
2014/07/08 15:47:08
Done.
| |
| 681 ExtensionTestMessageListener launched_listener("WebViewTest.LAUNCHED", | 680 ExtensionTestMessageListener launched_listener("WebViewTest.LAUNCHED", |
| 682 false); | 681 false); |
| 683 launched_listener.set_failure_message("WebViewTest.FAILURE"); | 682 launched_listener.set_failure_message("WebViewTest.FAILURE"); |
| 684 LoadAndLaunchPlatformApp(app_path.c_str(), &launched_listener); | 683 LoadAndLaunchPlatformApp(app_path.c_str(), &launched_listener); |
| 685 | 684 |
| 686 guest_web_contents_ = GetGuestViewManager()->WaitForGuestCreated(); | 685 guest_web_contents_ = GetGuestViewManager()->WaitForGuestCreated(); |
| 687 } | 686 } |
| 688 | 687 |
| 689 void SendMessageToEmbedder(const std::string& message) { | 688 void SendMessageToEmbedder(const std::string& message) { |
| 690 EXPECT_TRUE( | 689 EXPECT_TRUE( |
| (...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2177 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { | 2176 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { |
| 2178 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); | 2177 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); |
| 2179 } | 2178 } |
| 2180 | 2179 |
| 2181 // <webview> screenshot capture fails with ubercomp. | 2180 // <webview> screenshot capture fails with ubercomp. |
| 2182 // See http://crbug.com/327035. | 2181 // See http://crbug.com/327035. |
| 2183 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, | 2182 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, |
| 2184 DISABLED_Shim_ScreenshotCapture) { | 2183 DISABLED_Shim_ScreenshotCapture) { |
| 2185 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); | 2184 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); |
| 2186 } | 2185 } |
| OLD | NEW |