OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/test/browser_with_test_window_test.h" | 5 #include "chrome/test/browser_with_test_window_test.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <ole2.h> | 8 #include <ole2.h> |
9 #endif // defined(OS_WIN) | 9 #endif // defined(OS_WIN) |
10 | 10 |
11 #include "chrome/browser/tab_contents/navigation_controller.h" | 11 #include "chrome/browser/tab_contents/navigation_controller.h" |
12 #include "chrome/browser/tab_contents/navigation_entry.h" | 12 #include "chrome/browser/tab_contents/navigation_entry.h" |
13 #include "chrome/browser/tab_contents/tab_contents.h" | 13 #include "chrome/browser/tab_contents/tab_contents.h" |
14 #include "chrome/browser/tab_contents_wrapper.h" | |
15 #include "chrome/browser/tabs/tab_strip_model.h" | 14 #include "chrome/browser/tabs/tab_strip_model.h" |
16 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/browser_navigator.h" | 16 #include "chrome/browser/ui/browser_navigator.h" |
| 17 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
18 #include "chrome/common/render_messages.h" | 18 #include "chrome/common/render_messages.h" |
19 #include "chrome/test/testing_profile.h" | 19 #include "chrome/test/testing_profile.h" |
20 | 20 |
21 BrowserWithTestWindowTest::BrowserWithTestWindowTest() | 21 BrowserWithTestWindowTest::BrowserWithTestWindowTest() |
22 : ui_thread_(BrowserThread::UI, message_loop()), | 22 : ui_thread_(BrowserThread::UI, message_loop()), |
23 rph_factory_(), | 23 rph_factory_(), |
24 rvh_factory_(&rph_factory_) { | 24 rvh_factory_(&rph_factory_) { |
25 #if defined(OS_WIN) | 25 #if defined(OS_WIN) |
26 OleInitialize(NULL); | 26 OleInitialize(NULL); |
27 #endif | 27 #endif |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 void BrowserWithTestWindowTest::NavigateAndCommit( | 95 void BrowserWithTestWindowTest::NavigateAndCommit( |
96 NavigationController* controller, | 96 NavigationController* controller, |
97 const GURL& url) { | 97 const GURL& url) { |
98 controller->LoadURL(url, GURL(), 0); | 98 controller->LoadURL(url, GURL(), 0); |
99 CommitPendingLoad(controller); | 99 CommitPendingLoad(controller); |
100 } | 100 } |
101 | 101 |
102 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { | 102 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { |
103 NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url); | 103 NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url); |
104 } | 104 } |
OLD | NEW |