| OLD | NEW |
| 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 "chrome/browser/ui/browser_navigator_browsertest.h" | 5 #include "chrome/browser/ui/browser_navigator_browsertest.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 9 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 10 #include "chrome/browser/prefs/pref_service.h" | 10 #include "chrome/browser/prefs/pref_service.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 Browser::TYPE_POPUP, "Test", gfx::Rect(), profile)); | 80 Browser::TYPE_POPUP, "Test", gfx::Rect(), profile)); |
| 81 chrome::AddBlankTab(browser, true); | 81 chrome::AddBlankTab(browser, true); |
| 82 return browser; | 82 return browser; |
| 83 } | 83 } |
| 84 | 84 |
| 85 TabContents* BrowserNavigatorTest::CreateTabContents() { | 85 TabContents* BrowserNavigatorTest::CreateTabContents() { |
| 86 return chrome::TabContentsFactory( | 86 return chrome::TabContentsFactory( |
| 87 browser()->profile(), | 87 browser()->profile(), |
| 88 NULL, | 88 NULL, |
| 89 MSG_ROUTING_NONE, | 89 MSG_ROUTING_NONE, |
| 90 chrome::GetActiveWebContents(browser()), | 90 chrome::GetActiveWebContents(browser())); |
| 91 NULL); | |
| 92 } | 91 } |
| 93 | 92 |
| 94 void BrowserNavigatorTest::RunSuppressTest(WindowOpenDisposition disposition) { | 93 void BrowserNavigatorTest::RunSuppressTest(WindowOpenDisposition disposition) { |
| 95 GURL old_url = chrome::GetActiveWebContents(browser())->GetURL(); | 94 GURL old_url = chrome::GetActiveWebContents(browser())->GetURL(); |
| 96 chrome::NavigateParams p(MakeNavigateParams()); | 95 chrome::NavigateParams p(MakeNavigateParams()); |
| 97 p.disposition = disposition; | 96 p.disposition = disposition; |
| 98 chrome::Navigate(&p); | 97 chrome::Navigate(&p); |
| 99 | 98 |
| 100 // Nothing should have happened as a result of Navigate(); | 99 // Nothing should have happened as a result of Navigate(); |
| 101 EXPECT_EQ(1, browser()->tab_count()); | 100 EXPECT_EQ(1, browser()->tab_count()); |
| (...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1278 EXPECT_EQ(browser(), p2.browser); | 1277 EXPECT_EQ(browser(), p2.browser); |
| 1279 | 1278 |
| 1280 // We should now have two windows, the browser() provided by the framework and | 1279 // We should now have two windows, the browser() provided by the framework and |
| 1281 // the panel window we opened earlier. The tabbed browser window has 2 tabs. | 1280 // the panel window we opened earlier. The tabbed browser window has 2 tabs. |
| 1282 EXPECT_EQ(2u, BrowserList::size()); | 1281 EXPECT_EQ(2u, BrowserList::size()); |
| 1283 EXPECT_EQ(2, browser()->tab_count()); | 1282 EXPECT_EQ(2, browser()->tab_count()); |
| 1284 EXPECT_EQ(1, panel_browser->tab_count()); | 1283 EXPECT_EQ(1, panel_browser->tab_count()); |
| 1285 } | 1284 } |
| 1286 | 1285 |
| 1287 } // namespace | 1286 } // namespace |
| OLD | NEW |