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 "chrome/browser/apps/app_browsertest_util.h" | 5 #include "chrome/browser/apps/app_browsertest_util.h" |
6 #include "chrome/browser/extensions/extension_test_message_listener.h" | 6 #include "chrome/browser/extensions/extension_test_message_listener.h" |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/extensions/application_launch.h" | 9 #include "chrome/browser/ui/extensions/application_launch.h" |
10 #include "content/public/browser/notification_service.h" | 10 #include "content/public/browser/notification_service.h" |
11 #include "content/public/test/test_utils.h" | 11 #include "content/public/test/test_utils.h" |
12 #include "extensions/browser/app_window/app_window_geometry_cache.h" | 12 #include "extensions/browser/app_window/app_window_geometry_cache.h" |
13 #include "extensions/common/constants.h" | 13 #include "extensions/common/constants.h" |
14 #include "extensions/common/extension.h" | 14 #include "extensions/common/extension.h" |
| 15 #include "extensions/test/result_catcher.h" |
15 | 16 |
16 using extensions::AppWindowGeometryCache; | 17 using extensions::AppWindowGeometryCache; |
| 18 using extensions::ResultCatcher; |
17 | 19 |
18 // This helper class can be used to wait for changes in the app window | 20 // This helper class can be used to wait for changes in the app window |
19 // geometry cache registry for a specific window in a specific extension. | 21 // geometry cache registry for a specific window in a specific extension. |
20 class GeometryCacheChangeHelper : AppWindowGeometryCache::Observer { | 22 class GeometryCacheChangeHelper : AppWindowGeometryCache::Observer { |
21 public: | 23 public: |
22 GeometryCacheChangeHelper(AppWindowGeometryCache* cache, | 24 GeometryCacheChangeHelper(AppWindowGeometryCache* cache, |
23 const std::string& extension_id, | 25 const std::string& extension_id, |
24 const std::string& window_id, | 26 const std::string& window_id, |
25 const gfx::Rect& bounds) | 27 const gfx::Rect& bounds) |
26 : cache_(cache), | 28 : cache_(cache), |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); | 258 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); |
257 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; | 259 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; |
258 } | 260 } |
259 #endif | 261 #endif |
260 | 262 |
261 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { | 263 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { |
262 ASSERT_TRUE( | 264 ASSERT_TRUE( |
263 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) | 265 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) |
264 << message_; | 266 << message_; |
265 } | 267 } |
OLD | NEW |