| 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/chromeos/tab_closeable_state_watcher.h" | 5 #include "chrome/browser/chromeos/tab_closeable_state_watcher.h" |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "chrome/browser/first_run/first_run.h" | 8 #include "chrome/browser/first_run/first_run.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/tabs/tab_strip_model.h" | 10 #include "chrome/browser/tabs/tab_strip_model.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 | 59 |
| 60 // Wrapper for TabCloseableStateWatcher::CanCloseTab | 60 // Wrapper for TabCloseableStateWatcher::CanCloseTab |
| 61 bool CanCloseTab(const Browser* browser) { | 61 bool CanCloseTab(const Browser* browser) { |
| 62 return browser->tabstrip_model()->delegate()->CanCloseTab(); | 62 return browser->tabstrip_model()->delegate()->CanCloseTab(); |
| 63 } | 63 } |
| 64 | 64 |
| 65 // Create popup browser. | 65 // Create popup browser. |
| 66 Browser* CreatePopupBrowser() { | 66 Browser* CreatePopupBrowser() { |
| 67 // This is mostly duplicated from InPocessBrowserTest::CreateBrowser, | 67 // This is mostly duplicated from InPocessBrowserTest::CreateBrowser, |
| 68 // except that a popup browser is created here. | 68 // except that a popup browser is created here. |
| 69 Browser* popup_browser = Browser::CreateForType(Browser::TYPE_POPUP, | 69 Browser* popup_browser = Browser::CreateWithParams( |
| 70 browser()->profile()); | 70 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile())); |
| 71 AddTabWithURL(popup_browser, ntp_url_); | 71 AddTabWithURL(popup_browser, ntp_url_); |
| 72 popup_browser->window()->Show(); | 72 popup_browser->window()->Show(); |
| 73 return popup_browser; | 73 return popup_browser; |
| 74 } | 74 } |
| 75 | 75 |
| 76 // Create incognito browser. | 76 // Create incognito browser. |
| 77 Browser* CreateIncognitoBrowser() { | 77 Browser* CreateIncognitoBrowser() { |
| 78 // This is mostly duplicated from InPocessBrowserTest::CreateBrowser, | 78 // This is mostly duplicated from InPocessBrowserTest::CreateBrowser, |
| 79 // except that an incognito browser is created here. | 79 // except that an incognito browser is created here. |
| 80 Browser* incognito_browser = | 80 Browser* incognito_browser = |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 AppModalDialog* confirm = ui_test_utils::WaitForAppModalDialog(); | 327 AppModalDialog* confirm = ui_test_utils::WaitForAppModalDialog(); |
| 328 confirm->native_dialog()->AcceptAppModalDialog(); | 328 confirm->native_dialog()->AcceptAppModalDialog(); |
| 329 NewTabObserver new_tab_observer(browser()); | 329 NewTabObserver new_tab_observer(browser()); |
| 330 EXPECT_EQ(1u, BrowserList::size()); | 330 EXPECT_EQ(1u, BrowserList::size()); |
| 331 EXPECT_EQ(browser(), *(BrowserList::begin())); | 331 EXPECT_EQ(browser(), *(BrowserList::begin())); |
| 332 EXPECT_EQ(1, browser()->tab_count()); | 332 EXPECT_EQ(1, browser()->tab_count()); |
| 333 EXPECT_EQ(ntp_url_, browser()->GetSelectedWebContents()->GetURL()); | 333 EXPECT_EQ(ntp_url_, browser()->GetSelectedWebContents()->GetURL()); |
| 334 } | 334 } |
| 335 | 335 |
| 336 } // namespace chromeos | 336 } // namespace chromeos |
| OLD | NEW |