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/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/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/tab_contents/tab_contents.h" | |
10 #include "chrome/browser/tab_contents/tab_contents_view.h" | |
11 #include "chrome/browser/tabs/tab_strip_model.h" | 9 #include "chrome/browser/tabs/tab_strip_model.h" |
12 #include "chrome/browser/ui/browser_list.h" | 10 #include "chrome/browser/ui/browser_list.h" |
13 #include "chrome/browser/ui/browser_navigator.h" | 11 #include "chrome/browser/ui/browser_navigator.h" |
14 #include "chrome/browser/ui/browser_window.h" | 12 #include "chrome/browser/ui/browser_window.h" |
15 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 13 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
16 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
17 #include "chrome/test/ui_test_utils.h" | 15 #include "chrome/test/ui_test_utils.h" |
18 #include "ipc/ipc_message.h" | 16 #include "content/browser/tab_contents/tab_contents.h" |
| 17 #include "content/browser/tab_contents/tab_contents_view.h"\ |
19 | 18 |
20 GURL BrowserNavigatorTest::GetGoogleURL() const { | 19 GURL BrowserNavigatorTest::GetGoogleURL() const { |
21 return GURL("http://www.google.com/"); | 20 return GURL("http://www.google.com/"); |
22 } | 21 } |
23 | 22 |
24 browser::NavigateParams BrowserNavigatorTest::MakeNavigateParams() const { | 23 browser::NavigateParams BrowserNavigatorTest::MakeNavigateParams() const { |
25 return MakeNavigateParams(browser()); | 24 return MakeNavigateParams(browser()); |
26 } | 25 } |
27 | 26 |
28 browser::NavigateParams BrowserNavigatorTest::MakeNavigateParams( | 27 browser::NavigateParams BrowserNavigatorTest::MakeNavigateParams( |
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
783 | 782 |
784 // The bookmarks page should be opened in browser() window. | 783 // The bookmarks page should be opened in browser() window. |
785 EXPECT_NE(incognito_browser, p.browser); | 784 EXPECT_NE(incognito_browser, p.browser); |
786 EXPECT_EQ(browser(), p.browser); | 785 EXPECT_EQ(browser(), p.browser); |
787 EXPECT_EQ(2, browser()->tab_count()); | 786 EXPECT_EQ(2, browser()->tab_count()); |
788 EXPECT_EQ(GURL("chrome://bookmarks"), | 787 EXPECT_EQ(GURL("chrome://bookmarks"), |
789 browser()->GetSelectedTabContents()->GetURL()); | 788 browser()->GetSelectedTabContents()->GetURL()); |
790 } | 789 } |
791 | 790 |
792 } // namespace | 791 } // namespace |
OLD | NEW |