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

Side by Side Diff: chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

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 "extensions/browser/app_window/native_app_window.h" 5 #include "extensions/browser/app_window/native_app_window.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #import "base/mac/foundation_util.h" 9 #import "base/mac/foundation_util.h"
10 #import "base/mac/mac_util.h" 10 #import "base/mac/mac_util.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 void SetUpAppWithWindows(int num_windows) { 60 void SetUpAppWithWindows(int num_windows) {
61 app_ = InstallExtension( 61 app_ = InstallExtension(
62 test_data_dir_.AppendASCII("platform_apps").AppendASCII("minimal"), 1); 62 test_data_dir_.AppendASCII("platform_apps").AppendASCII("minimal"), 1);
63 EXPECT_TRUE(app_); 63 EXPECT_TRUE(app_);
64 64
65 for (int i = 0; i < num_windows; ++i) { 65 for (int i = 0; i < num_windows; ++i) {
66 content::WindowedNotificationObserver app_loaded_observer( 66 content::WindowedNotificationObserver app_loaded_observer(
67 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, 67 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
68 content::NotificationService::AllSources()); 68 content::NotificationService::AllSources());
69 OpenApplication( 69 OpenApplication(AppLaunchParams(
70 AppLaunchParams(profile(), app_, extensions::LAUNCH_CONTAINER_NONE, 70 profile(), app_, extensions::LAUNCH_CONTAINER_NONE,
71 NEW_WINDOW, extensions::SOURCE_TEST)); 71 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
72 app_loaded_observer.Wait(); 72 app_loaded_observer.Wait();
73 } 73 }
74 } 74 }
75 75
76 const extensions::Extension* app_; 76 const extensions::Extension* app_;
77 77
78 private: 78 private:
79 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoaBrowserTest); 79 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoaBrowserTest);
80 }; 80 };
81 81
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 [expected_color getComponents:expected_components]; 689 [expected_color getComponents:expected_components];
690 [color getComponents:color_components]; 690 [color getComponents:color_components];
691 EXPECT_NEAR(expected_components[0], color_components[0], 0.01); 691 EXPECT_NEAR(expected_components[0], color_components[0], 0.01);
692 EXPECT_NEAR(expected_components[1], color_components[1], 0.01); 692 EXPECT_NEAR(expected_components[1], color_components[1], 0.01);
693 EXPECT_NEAR(expected_components[2], color_components[2], 0.01); 693 EXPECT_NEAR(expected_components[2], color_components[2], 0.01);
694 } 694 }
695 695
696 INSTANTIATE_TEST_CASE_P(NativeAppWindowCocoaBrowserTestInstance, 696 INSTANTIATE_TEST_CASE_P(NativeAppWindowCocoaBrowserTestInstance,
697 NativeAppWindowCocoaBrowserTest, 697 NativeAppWindowCocoaBrowserTest,
698 ::testing::Bool()); 698 ::testing::Bool());
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698