Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(369)

Side by Side Diff: chrome/test/browser_with_test_window_test.cc

Issue 4694008: Make pink's TabContentsWrapper change compile on Windows.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
14 #include "chrome/browser/tabs/tab_strip_model.h" 15 #include "chrome/browser/tabs/tab_strip_model.h"
15 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_navigator.h" 17 #include "chrome/browser/ui/browser_navigator.h"
17 #include "chrome/common/render_messages.h" 18 #include "chrome/common/render_messages.h"
18 #include "chrome/test/testing_profile.h" 19 #include "chrome/test/testing_profile.h"
19 20
20 BrowserWithTestWindowTest::BrowserWithTestWindowTest() 21 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
21 : ui_thread_(BrowserThread::UI, message_loop()), 22 : ui_thread_(BrowserThread::UI, message_loop()),
22 rph_factory_(), 23 rph_factory_(),
23 rvh_factory_(&rph_factory_) { 24 rvh_factory_(&rph_factory_) {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 void BrowserWithTestWindowTest::NavigateAndCommit( 95 void BrowserWithTestWindowTest::NavigateAndCommit(
95 NavigationController* controller, 96 NavigationController* controller,
96 const GURL& url) { 97 const GURL& url) {
97 controller->LoadURL(url, GURL(), 0); 98 controller->LoadURL(url, GURL(), 0);
98 CommitPendingLoad(controller); 99 CommitPendingLoad(controller);
99 } 100 }
100 101
101 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { 102 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) {
102 NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url); 103 NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url);
103 } 104 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698