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

Unified Diff: chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

Issue 2288003002: Delete IsAtLeastOS10_9() and IsAtMostOS10_9() (Closed)
Patch Set: Clean up a duplicate check, delete a stray ! Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
index 6c49dca17469d331bc682d01733cf0c18e741be6..244d2bf20dd895e216de33feb2fc219677529f40 100644
--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
@@ -556,7 +556,7 @@ void TestControls(AppWindow* app_window) {
// fullscreen action. The above check that collectionBehavior does not include
// NSWindowCollectionBehaviorFullScreenPrimary is sufficient to determine that
// the window can't be fullscreened.
- if (base::mac::IsOS10_9()) {
+ if (!base::mac::IsAtLeastOS10_10()) {
EXPECT_EQ(can_fullscreen,
[[ns_window standardWindowButton:NSWindowZoomButton] isEnabled]);
}
@@ -636,7 +636,7 @@ NSBitmapImageRep* ScreenshotNSWindow(NSWindow* window) {
// NOTE: This doesn't work with Views, but the regular test does, so use that.
bool mac_views = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableMacViewsNativeAppWindows);
- if (base::mac::IsOS10_9() && !mac_views) {
+ if (!base::mac::IsAtLeastOS10_10() && !mac_views) {
// -[NSView setNeedsDisplay:YES] doesn't synchronously display the view, it
// gets drawn by another event in the queue, so let that run first.
content::RunAllPendingInMessageLoop();

Powered by Google App Engine
This is Rietveld 408576698