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

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

Issue 6672070: Move the remaining files in chrome\common to content\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 months 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
« no previous file with comments | « chrome/test/automation/tab_proxy.h ('k') | chrome/test/chrome_process_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/tabs/tab_strip_model.h" 11 #include "chrome/browser/tabs/tab_strip_model.h"
12 #include "chrome/browser/ui/browser_navigator.h" 12 #include "chrome/browser/ui/browser_navigator.h"
13 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 13 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
14 #include "chrome/common/page_transition_types.h"
15 #include "chrome/common/render_messages.h" 14 #include "chrome/common/render_messages.h"
16 #include "chrome/test/testing_profile.h" 15 #include "chrome/test/testing_profile.h"
17 #include "content/browser/tab_contents/navigation_controller.h" 16 #include "content/browser/tab_contents/navigation_controller.h"
18 #include "content/browser/tab_contents/navigation_entry.h" 17 #include "content/browser/tab_contents/navigation_entry.h"
19 #include "content/browser/tab_contents/tab_contents.h" 18 #include "content/browser/tab_contents/tab_contents.h"
20 #include "content/common/content_client.h" 19 #include "content/common/content_client.h"
20 #include "content/common/page_transition_types.h"
21 21
22 BrowserWithTestWindowTest::BrowserWithTestWindowTest() 22 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
23 : ui_thread_(BrowserThread::UI, message_loop()), 23 : ui_thread_(BrowserThread::UI, message_loop()),
24 file_thread_(BrowserThread::FILE, message_loop()), 24 file_thread_(BrowserThread::FILE, message_loop()),
25 rph_factory_(), 25 rph_factory_(),
26 rvh_factory_(&rph_factory_) { 26 rvh_factory_(&rph_factory_) {
27 #if defined(OS_WIN) 27 #if defined(OS_WIN)
28 OleInitialize(NULL); 28 OleInitialize(NULL);
29 #endif 29 #endif
30 } 30 }
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 void BrowserWithTestWindowTest::NavigateAndCommit( 100 void BrowserWithTestWindowTest::NavigateAndCommit(
101 NavigationController* controller, 101 NavigationController* controller,
102 const GURL& url) { 102 const GURL& url) {
103 controller->LoadURL(url, GURL(), PageTransition::LINK); 103 controller->LoadURL(url, GURL(), PageTransition::LINK);
104 CommitPendingLoad(controller); 104 CommitPendingLoad(controller);
105 } 105 }
106 106
107 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { 107 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) {
108 NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url); 108 NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url);
109 } 109 }
OLDNEW
« no previous file with comments | « chrome/test/automation/tab_proxy.h ('k') | chrome/test/chrome_process_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698