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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 content::WebContents* web_contents_; | 123 content::WebContents* web_contents_; |
124 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; | 124 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; |
125 }; | 125 }; |
126 | 126 |
127 class WebContentsHiddenObserver : public content::WebContentsObserver { | 127 class WebContentsHiddenObserver : public content::WebContentsObserver { |
128 public: | 128 public: |
129 WebContentsHiddenObserver(content::WebContents* web_contents, | 129 WebContentsHiddenObserver(content::WebContents* web_contents, |
130 const base::Closure& hidden_callback) | 130 const base::Closure& hidden_callback) |
131 : WebContentsObserver(web_contents), | 131 : WebContentsObserver(web_contents), |
132 hidden_callback_(hidden_callback), | 132 hidden_callback_(hidden_callback), |
133 hidden_observed_(true) { | 133 hidden_observed_(false) { |
134 } | 134 } |
135 | 135 |
136 // WebContentsObserver. | 136 // WebContentsObserver. |
137 virtual void WasHidden() OVERRIDE { | 137 virtual void WasHidden() OVERRIDE { |
138 hidden_observed_ = true; | 138 hidden_observed_ = true; |
139 hidden_callback_.Run(); | 139 hidden_callback_.Run(); |
140 } | 140 } |
141 | 141 |
142 bool hidden_observed() { return hidden_observed_; } | 142 bool hidden_observed() { return hidden_observed_; } |
143 | 143 |
(...skipping 1993 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2137 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { | 2137 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { |
2138 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); | 2138 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); |
2139 } | 2139 } |
2140 | 2140 |
2141 // <webview> screenshot capture fails with ubercomp. | 2141 // <webview> screenshot capture fails with ubercomp. |
2142 // See http://crbug.com/327035. | 2142 // See http://crbug.com/327035. |
2143 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, | 2143 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, |
2144 DISABLED_Shim_ScreenshotCapture) { | 2144 DISABLED_Shim_ScreenshotCapture) { |
2145 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); | 2145 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); |
2146 } | 2146 } |
OLD | NEW |