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

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

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 3 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 "build/build_config.h" 5 #include "build/build_config.h"
6 #include "chrome/browser/apps/app_browsertest_util.h" 6 #include "chrome/browser/apps/app_browsertest_util.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/app_launch_params.h" 9 #include "chrome/browser/ui/extensions/app_launch_params.h"
10 #include "chrome/browser/ui/extensions/application_launch.h" 10 #include "chrome/browser/ui/extensions/application_launch.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 ExtensionTestMessageListener launched_listener("Launched", true); 211 ExtensionTestMessageListener launched_listener("Launched", true);
212 212
213 content::WindowedNotificationObserver app_loaded_observer( 213 content::WindowedNotificationObserver app_loaded_observer(
214 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, 214 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
215 content::NotificationService::AllSources()); 215 content::NotificationService::AllSources());
216 216
217 const extensions::Extension* extension = LoadExtension( 217 const extensions::Extension* extension = LoadExtension(
218 test_data_dir_.AppendASCII("platform_apps").AppendASCII("window_api")); 218 test_data_dir_.AppendASCII("platform_apps").AppendASCII("window_api"));
219 EXPECT_TRUE(extension); 219 EXPECT_TRUE(extension);
220 220
221 OpenApplication(AppLaunchParams(browser()->profile(), extension, 221 OpenApplication(AppLaunchParams(
222 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, 222 browser()->profile(), extension, extensions::LAUNCH_CONTAINER_NONE,
223 extensions::SOURCE_TEST)); 223 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
224 224
225 ExtensionTestMessageListener geometry_listener("ListenGeometryChange", true); 225 ExtensionTestMessageListener geometry_listener("ListenGeometryChange", true);
226 226
227 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); 227 ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
228 launched_listener.Reply("testRestoreAfterGeometryCacheChange"); 228 launched_listener.Reply("testRestoreAfterGeometryCacheChange");
229 229
230 ASSERT_TRUE(geometry_listener.WaitUntilSatisfied()); 230 ASSERT_TRUE(geometry_listener.WaitUntilSatisfied());
231 231
232 GeometryCacheChangeHelper geo_change_helper_1( 232 GeometryCacheChangeHelper geo_change_helper_1(
233 AppWindowGeometryCache::Get(browser()->profile()), 233 AppWindowGeometryCache::Get(browser()->profile()),
(...skipping 23 matching lines...) Expand all
257 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { 257 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) {
258 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; 258 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
259 } 259 }
260 #endif 260 #endif
261 261
262 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { 262 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) {
263 ASSERT_TRUE( 263 ASSERT_TRUE(
264 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) 264 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces"))
265 << message_; 265 << message_;
266 } 266 }
OLDNEW
« no previous file with comments | « chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc ('k') | chrome/browser/apps/guest_view/web_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698