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

Side by Side Diff: chrome/browser/extensions/api/tabs/tabs_test.cc

Issue 1849343003: mac: Remove IsOSSnowLeopard(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <limits.h> 5 #include <limits.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 1052
1053 chrome::CloseWindow(normal_browser); 1053 chrome::CloseWindow(normal_browser);
1054 chrome::CloseWindow(popup_browser); 1054 chrome::CloseWindow(popup_browser);
1055 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); 1055 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
1056 CloseAppWindow(app_window); 1056 CloseAppWindow(app_window);
1057 } 1057 }
1058 #endif // !defined(OS_MACOSX) 1058 #endif // !defined(OS_MACOSX)
1059 1059
1060 IN_PROC_BROWSER_TEST_F(ExtensionWindowCreateTest, AcceptState) { 1060 IN_PROC_BROWSER_TEST_F(ExtensionWindowCreateTest, AcceptState) {
1061 #if defined(OS_MACOSX) 1061 #if defined(OS_MACOSX)
1062 // ScopedFakeNSWindowFullscreen works on MacOS 10.7+.
1063 if (base::mac::IsOSSnowLeopard())
1064 return;
1065
1066 ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen; 1062 ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
1067 #endif 1063 #endif
1068 1064
1069 scoped_refptr<WindowsCreateFunction> function(new WindowsCreateFunction()); 1065 scoped_refptr<WindowsCreateFunction> function(new WindowsCreateFunction());
1070 scoped_refptr<Extension> extension(test_util::CreateEmptyExtension()); 1066 scoped_refptr<Extension> extension(test_util::CreateEmptyExtension());
1071 function->set_extension(extension.get()); 1067 function->set_extension(extension.get());
1072 1068
1073 scoped_ptr<base::DictionaryValue> result( 1069 scoped_ptr<base::DictionaryValue> result(
1074 utils::ToDictionary(utils::RunFunctionAndReturnSingleResult( 1070 utils::ToDictionary(utils::RunFunctionAndReturnSingleResult(
1075 function.get(), "[{\"state\": \"minimized\"}]", browser(), 1071 function.get(), "[{\"state\": \"minimized\"}]", browser(),
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 EXPECT_TRUE( 1746 EXPECT_TRUE(
1751 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl)); 1747 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl));
1752 1748
1753 // chrome.tabs.setZoomSettings(). 1749 // chrome.tabs.setZoomSettings().
1754 error = RunSetZoomSettingsExpectError(tab_id, "manual", "per-tab"); 1750 error = RunSetZoomSettingsExpectError(tab_id, "manual", "per-tab");
1755 EXPECT_TRUE( 1751 EXPECT_TRUE(
1756 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl)); 1752 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl));
1757 } 1753 }
1758 1754
1759 } // namespace extensions 1755 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698