Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(685)

Side by Side Diff: chrome/browser/apps/app_window_browsertest.cc

Issue 186343002: Create windows for new app window bounds API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nit Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/app_window_geometry_cache.h" 5 #include "apps/app_window_geometry_cache.h"
6 #include "chrome/browser/apps/app_browsertest_util.h" 6 #include "chrome/browser/apps/app_browsertest_util.h"
7 #include "chrome/browser/extensions/extension_test_message_listener.h" 7 #include "chrome/browser/extensions/extension_test_message_listener.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/extensions/application_launch.h" 10 #include "chrome/browser/ui/extensions/application_launch.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 } 119 }
120 120
121 launched_listener.Reply(testName); 121 launched_listener.Reply(testName);
122 return true; 122 return true;
123 } 123 }
124 }; 124 };
125 125
126 // These tests are flaky after https://codereview.chromium.org/57433010/. 126 // These tests are flaky after https://codereview.chromium.org/57433010/.
127 // See http://crbug.com/319613. 127 // See http://crbug.com/319613.
128 128
129 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestCreate) { 129 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestCreate) {
130 ASSERT_TRUE(RunAppWindowAPITest("testCreate")) << message_; 130 ASSERT_TRUE(RunAppWindowAPITest("testCreate")) << message_;
131 } 131 }
132 132
133 #if defined(TOOLKIT_GTK)
134 #define MAYBE_TestDeprecatedBounds DISABLED_TestDeprecatedBounds
135 #else
136 #define MAYBE_TestDeprecatedBounds TestDeprecatedBounds
137 #endif
138
139 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, MAYBE_TestDeprecatedBounds) {
140 ASSERT_TRUE(RunAppWindowAPITest("testDeprecatedBounds")) << message_;
141 }
142
143 #if defined(TOOLKIT_GTK)
144 #define MAYBE_TestInitialBounds DISABLED_TestInitialBounds
145 #else
146 #define MAYBE_TestInitialBounds TestInitialBounds
147 #endif
148
149 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, MAYBE_TestInitialBounds) {
150 ASSERT_TRUE(RunAppWindowAPITest("testInitialBounds")) << message_;
151 }
152
153 #if defined(TOOLKIT_GTK)
154 #define MAYBE_TestInitialBoundsInStable DISABLED_TestInitialBoundsInStable
155 #else
156 #define MAYBE_TestInitialBoundsInStable TestInitialBoundsInStable
157 #endif
158
159 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, MAYBE_TestInitialBoundsInStable) {
160 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE);
161 ASSERT_TRUE(RunAppWindowAPITest("testInitialBoundsInStable")) << message_;
162 }
163
164 #if defined(TOOLKIT_GTK)
165 #define MAYBE_TestInitialConstraints DISABLED_TestInitialConstraints
166 #else
167 #define MAYBE_TestInitialConstraints TestInitialConstraints
168 #endif
169
170 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, MAYBE_TestInitialConstraints) {
171 ASSERT_TRUE(RunAppWindowAPITest("testInitialConstraints")) << message_;
172 }
173
133 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestSingleton) { 174 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestSingleton) {
134 ASSERT_TRUE(RunAppWindowAPITest("testSingleton")) << message_; 175 ASSERT_TRUE(RunAppWindowAPITest("testSingleton")) << message_;
135 } 176 }
136 177
137 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestBounds) {
138 ASSERT_TRUE(RunAppWindowAPITest("testBounds")) << message_;
139 }
140
141 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestCloseEvent) { 178 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestCloseEvent) {
142 ASSERT_TRUE(RunAppWindowAPITest("testCloseEvent")) << message_; 179 ASSERT_TRUE(RunAppWindowAPITest("testCloseEvent")) << message_;
143 } 180 }
144 181
145 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestMaximize) { 182 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestMaximize) {
146 ASSERT_TRUE(RunAppWindowAPITest("testMaximize")) << message_; 183 ASSERT_TRUE(RunAppWindowAPITest("testMaximize")) << message_;
147 } 184 }
148 185
149 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestRestore) { 186 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestRestore) {
150 ASSERT_TRUE(RunAppWindowAPITest("testRestore")) << message_; 187 ASSERT_TRUE(RunAppWindowAPITest("testRestore")) << message_;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 #if defined(USE_AURA) 257 #if defined(USE_AURA)
221 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { 258 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) {
222 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; 259 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
223 } 260 }
224 261
225 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) { 262 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) {
226 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); 263 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE);
227 ASSERT_TRUE(RunAppWindowAPITest("testFrameColorsInStable")) << message_; 264 ASSERT_TRUE(RunAppWindowAPITest("testFrameColorsInStable")) << message_;
228 } 265 }
229 #endif 266 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698