OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "base/logging.h" | 8 #include "base/logging.h" |
9 #include "chrome/browser/app_modal_dialog.h" | 9 #include "chrome/browser/app_modal_dialog.h" |
10 #include "chrome/browser/browser.h" | 10 #include "chrome/browser/browser.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 ntp_url_ = GURL(chrome::kChromeUINewTabURL); | 29 ntp_url_ = GURL(chrome::kChromeUINewTabURL); |
30 other_url_ = ui_test_utils::GetTestUrl( | 30 other_url_ = ui_test_utils::GetTestUrl( |
31 FilePath(FilePath::kCurrentDirectory), | 31 FilePath(FilePath::kCurrentDirectory), |
32 FilePath(FILE_PATH_LITERAL("title2.html"))); | 32 FilePath(FILE_PATH_LITERAL("title2.html"))); |
33 } | 33 } |
34 | 34 |
35 protected: | 35 protected: |
36 // Wrapper for Browser::AddTabWithURL | 36 // Wrapper for Browser::AddTabWithURL |
37 void AddTabWithURL(Browser* browser, const GURL& url) { | 37 void AddTabWithURL(Browser* browser, const GURL& url) { |
38 browser->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0, | 38 browser->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0, |
39 TabStripModel::ADD_SELECTED, NULL, std::string()); | 39 TabStripModel::ADD_SELECTED, NULL, std::string(), |
| 40 &browser); |
40 // Wait for page to finish loading. | 41 // Wait for page to finish loading. |
41 ui_test_utils::WaitForNavigation( | 42 ui_test_utils::WaitForNavigation( |
42 &browser->GetSelectedTabContents()->controller()); | 43 &browser->GetSelectedTabContents()->controller()); |
43 } | 44 } |
44 | 45 |
45 // Wrapper for TabCloseableStateWatcher::CanCloseTab | 46 // Wrapper for TabCloseableStateWatcher::CanCloseTab |
46 bool CanCloseTab(const Browser* browser) { | 47 bool CanCloseTab(const Browser* browser) { |
47 return browser->tabstrip_model()->delegate()->CanCloseTab(); | 48 return browser->tabstrip_model()->delegate()->CanCloseTab(); |
48 } | 49 } |
49 | 50 |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 confirm->AcceptWindow(); | 310 confirm->AcceptWindow(); |
310 NewTabObserver new_tab_observer(browser()); | 311 NewTabObserver new_tab_observer(browser()); |
311 EXPECT_EQ(1u, BrowserList::size()); | 312 EXPECT_EQ(1u, BrowserList::size()); |
312 EXPECT_EQ(browser(), *(BrowserList::begin())); | 313 EXPECT_EQ(browser(), *(BrowserList::begin())); |
313 EXPECT_EQ(1, browser()->tab_count()); | 314 EXPECT_EQ(1, browser()->tab_count()); |
314 EXPECT_EQ(ntp_url_, browser()->GetSelectedTabContents()->GetURL()); | 315 EXPECT_EQ(ntp_url_, browser()->GetSelectedTabContents()->GetURL()); |
315 } | 316 } |
316 | 317 |
317 } // namespace chromeos | 318 } // namespace chromeos |
318 | 319 |
OLD | NEW |