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