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/memory/singleton.h" | |
|
lazyboy
2014/06/17 23:46:45
Revert.
Fady Samuel
2014/06/18 21:08:33
Done.
| |
| 6 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 7 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/apps/app_browsertest_util.h" | 11 #include "chrome/browser/apps/app_browsertest_util.h" |
| 11 #include "chrome/browser/chrome_content_browser_client.h" | 12 #include "chrome/browser/chrome_content_browser_client.h" |
| 12 #include "chrome/browser/extensions/extension_test_message_listener.h" | 13 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 13 #include "chrome/browser/guest_view/guest_view_manager.h" | 14 #include "chrome/browser/guest_view/guest_view_manager.h" |
| 14 #include "chrome/browser/guest_view/guest_view_manager_factory.h" | 15 #include "chrome/browser/guest_view/guest_view_manager_factory.h" |
| 15 #include "chrome/browser/prerender/prerender_link_manager.h" | 16 #include "chrome/browser/prerender/prerender_link_manager.h" |
| (...skipping 2172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2188 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { | 2189 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { |
| 2189 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); | 2190 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); |
| 2190 } | 2191 } |
| 2191 | 2192 |
| 2192 // <webview> screenshot capture fails with ubercomp. | 2193 // <webview> screenshot capture fails with ubercomp. |
| 2193 // See http://crbug.com/327035. | 2194 // See http://crbug.com/327035. |
| 2194 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, | 2195 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, |
| 2195 DISABLED_Shim_ScreenshotCapture) { | 2196 DISABLED_Shim_ScreenshotCapture) { |
| 2196 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); | 2197 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); |
| 2197 } | 2198 } |
| OLD | NEW |