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

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

Issue 1662783002: Remove HostDesktopType from Browser::CreateParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-12
Patch Set: remove desktop_type_ in bookmark_bubble_sign_in_delegate Created 4 years, 10 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 // browser test doesn't seem to do anything, so can't test the opposite 157 // browser test doesn't seem to do anything, so can't test the opposite
158 // either. 158 // either.
159 EXPECT_EQ(browser()->window()->IsActive(), 159 EXPECT_EQ(browser()->window()->IsActive(),
160 api_test_utils::GetBoolean(result.get(), "focused")); 160 api_test_utils::GetBoolean(result.get(), "focused"));
161 161
162 // TODO(aa): Minimized and maximized dimensions. Is there a way to set 162 // TODO(aa): Minimized and maximized dimensions. Is there a way to set
163 // minimize/maximize programmatically? 163 // minimize/maximize programmatically?
164 164
165 // Popup. 165 // Popup.
166 Browser* popup_browser = new Browser( 166 Browser* popup_browser = new Browser(
167 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(), 167 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile()));
168 browser()->host_desktop_type()));
169 function = new WindowsGetFunction(); 168 function = new WindowsGetFunction();
170 function->set_extension(extension.get()); 169 function->set_extension(extension.get());
171 result.reset(utils::ToDictionary( 170 result.reset(utils::ToDictionary(
172 utils::RunFunctionAndReturnSingleResult( 171 utils::RunFunctionAndReturnSingleResult(
173 function.get(), 172 function.get(),
174 base::StringPrintf( 173 base::StringPrintf(
175 "[%u]", ExtensionTabUtil::GetWindowId(popup_browser)), 174 "[%u]", ExtensionTabUtil::GetWindowId(popup_browser)),
176 browser()))); 175 browser())));
177 EXPECT_EQ("popup", api_test_utils::GetString(result.get(), "type")); 176 EXPECT_EQ("popup", api_test_utils::GetString(result.get(), "type"));
178 177
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 EXPECT_EQ(window_ids, result_ids); 633 EXPECT_EQ(window_ids, result_ids);
635 634
636 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); 635 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
637 } 636 }
638 637
639 IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DontCreateTabInClosingPopupWindow) { 638 IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DontCreateTabInClosingPopupWindow) {
640 // Test creates new popup window, closes it right away and then tries to open 639 // Test creates new popup window, closes it right away and then tries to open
641 // a new tab in it. Tab should not be opened in the popup window, but in a 640 // a new tab in it. Tab should not be opened in the popup window, but in a
642 // tabbed browser window. 641 // tabbed browser window.
643 Browser* popup_browser = new Browser( 642 Browser* popup_browser = new Browser(
644 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(), 643 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile()));
645 browser()->host_desktop_type()));
646 int window_id = ExtensionTabUtil::GetWindowId(popup_browser); 644 int window_id = ExtensionTabUtil::GetWindowId(popup_browser);
647 chrome::CloseWindow(popup_browser); 645 chrome::CloseWindow(popup_browser);
648 646
649 scoped_refptr<TabsCreateFunction> create_tab_function( 647 scoped_refptr<TabsCreateFunction> create_tab_function(
650 new TabsCreateFunction()); 648 new TabsCreateFunction());
651 create_tab_function->set_extension(test_util::CreateEmptyExtension().get()); 649 create_tab_function->set_extension(test_util::CreateEmptyExtension().get());
652 // Without a callback the function will not generate a result. 650 // Without a callback the function will not generate a result.
653 create_tab_function->set_has_callback(true); 651 create_tab_function->set_has_callback(true);
654 652
655 static const char kNewBlankTabArgs[] = 653 static const char kNewBlankTabArgs[] =
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 EXPECT_NE(nullptr, widget); 901 EXPECT_NE(nullptr, widget);
904 WidgetActivatedWaiter waiter(widget); 902 WidgetActivatedWaiter waiter(widget);
905 waiter.ActivateAndWait(); 903 waiter.ActivateAndWait();
906 } 904 }
907 905
908 Browser* ExtensionWindowLastFocusedTest::CreateBrowserWithEmptyTab( 906 Browser* ExtensionWindowLastFocusedTest::CreateBrowserWithEmptyTab(
909 bool as_popup) { 907 bool as_popup) {
910 Browser* new_browser; 908 Browser* new_browser;
911 if (as_popup) 909 if (as_popup)
912 new_browser = new Browser( 910 new_browser = new Browser(
913 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(), 911 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile()));
914 browser()->host_desktop_type()));
915 else 912 else
916 new_browser = new Browser(Browser::CreateParams( 913 new_browser = new Browser(Browser::CreateParams(browser()->profile()));
917 browser()->profile(), browser()->host_desktop_type()));
918 AddBlankTabAndShow(new_browser); 914 AddBlankTabAndShow(new_browser);
919 return new_browser; 915 return new_browser;
920 } 916 }
921 917
922 int ExtensionWindowLastFocusedTest::GetTabId( 918 int ExtensionWindowLastFocusedTest::GetTabId(
923 const base::DictionaryValue* value) const { 919 const base::DictionaryValue* value) const {
924 const base::ListValue* tabs = NULL; 920 const base::ListValue* tabs = NULL;
925 if (!value->GetList(keys::kTabsKey, &tabs)) 921 if (!value->GetList(keys::kTabsKey, &tabs))
926 return -2; 922 return -2;
927 const base::Value* tab = NULL; 923 const base::Value* tab = NULL;
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 ASSERT_TRUE( 1260 ASSERT_TRUE(
1265 LoadExtension(test_data_dir_.AppendASCII("api_test/windows/events"))); 1261 LoadExtension(test_data_dir_.AppendASCII("api_test/windows/events")));
1266 ASSERT_TRUE(listener.WaitUntilSatisfied()); 1262 ASSERT_TRUE(listener.WaitUntilSatisfied());
1267 1263
1268 AppWindow* app_window = CreateTestAppWindow( 1264 AppWindow* app_window = CreateTestAppWindow(
1269 "{\"outerBounds\": " 1265 "{\"outerBounds\": "
1270 "{\"width\": 300, \"height\": 300," 1266 "{\"width\": 300, \"height\": 300,"
1271 " \"minWidth\": 200, \"minHeight\": 200," 1267 " \"minWidth\": 200, \"minHeight\": 200,"
1272 " \"maxWidth\": 400, \"maxHeight\": 400}}"); 1268 " \"maxWidth\": 400, \"maxHeight\": 400}}");
1273 1269
1274 Browser* browser_window = new Browser(Browser::CreateParams( 1270 Browser* browser_window =
1275 browser()->profile(), browser()->host_desktop_type())); 1271 new Browser(Browser::CreateParams(browser()->profile()));
1276 AddBlankTabAndShow(browser_window); 1272 AddBlankTabAndShow(browser_window);
1277 1273
1278 DevToolsWindow* devtools_window = 1274 DevToolsWindow* devtools_window =
1279 DevToolsWindowTesting::OpenDevToolsWindowSync( 1275 DevToolsWindowTesting::OpenDevToolsWindowSync(
1280 browser()->tab_strip_model()->GetWebContentsAt(0), 1276 browser()->tab_strip_model()->GetWebContentsAt(0),
1281 false /* is_docked */); 1277 false /* is_docked */);
1282 1278
1283 chrome::CloseWindow(browser_window); 1279 chrome::CloseWindow(browser_window);
1284 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window); 1280 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
1285 CloseAppWindow(app_window); 1281 CloseAppWindow(app_window);
(...skipping 464 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