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/profiles/profile.h" | 6 #include "chrome/browser/profiles/profile.h" |
7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
8 #include "chrome/browser/ui/extensions/app_launch_params.h" | 8 #include "chrome/browser/ui/extensions/app_launch_params.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" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 return; | 54 return; |
55 | 55 |
56 if (bounds_.x() != bounds.x() && | 56 if (bounds_.x() != bounds.x() && |
57 bounds_.y() != bounds.y() && | 57 bounds_.y() != bounds.y() && |
58 bounds_.width() != bounds.width() && | 58 bounds_.width() != bounds.width() && |
59 bounds_.height() != bounds.height()) { | 59 bounds_.height() != bounds.height()) { |
60 satisfied_ = true; | 60 satisfied_ = true; |
61 cache_->RemoveObserver(this); | 61 cache_->RemoveObserver(this); |
62 | 62 |
63 if (waiting_) | 63 if (waiting_) |
64 base::MessageLoopForUI::current()->Quit(); | 64 base::MessageLoopForUI::current()->QuitWhenIdle(); |
65 } | 65 } |
66 } | 66 } |
67 | 67 |
68 private: | 68 private: |
69 AppWindowGeometryCache* cache_; | 69 AppWindowGeometryCache* cache_; |
70 std::string extension_id_; | 70 std::string extension_id_; |
71 std::string window_id_; | 71 std::string window_id_; |
72 gfx::Rect bounds_; | 72 gfx::Rect bounds_; |
73 bool satisfied_; | 73 bool satisfied_; |
74 bool waiting_; | 74 bool waiting_; |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { | 256 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { |
257 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; | 257 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; |
258 } | 258 } |
259 #endif | 259 #endif |
260 | 260 |
261 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { | 261 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { |
262 ASSERT_TRUE( | 262 ASSERT_TRUE( |
263 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) | 263 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) |
264 << message_; | 264 << message_; |
265 } | 265 } |
OLD | NEW |