OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/base/browser_with_test_window_test.h" | 5 #include "chrome/test/base/browser_with_test_window_test.h" |
6 | 6 |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "chrome/browser/profiles/profile_destroyer.h" | 8 #include "chrome/browser/profiles/profile_destroyer.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_navigator.h" | 10 #include "chrome/browser/ui/browser_navigator.h" |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 | 151 |
152 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { | 152 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { |
153 NavigateAndCommit(&browser()->tab_strip_model()->GetActiveWebContents()-> | 153 NavigateAndCommit(&browser()->tab_strip_model()->GetActiveWebContents()-> |
154 GetController(), | 154 GetController(), |
155 url); | 155 url); |
156 } | 156 } |
157 | 157 |
158 void BrowserWithTestWindowTest::NavigateAndCommitActiveTabWithTitle( | 158 void BrowserWithTestWindowTest::NavigateAndCommitActiveTabWithTitle( |
159 Browser* navigating_browser, | 159 Browser* navigating_browser, |
160 const GURL& url, | 160 const GURL& url, |
161 const string16& title) { | 161 const base::string16& title) { |
162 NavigationController* controller = &navigating_browser->tab_strip_model()-> | 162 NavigationController* controller = &navigating_browser->tab_strip_model()-> |
163 GetActiveWebContents()->GetController(); | 163 GetActiveWebContents()->GetController(); |
164 NavigateAndCommit(controller, url); | 164 NavigateAndCommit(controller, url); |
165 controller->GetActiveEntry()->SetTitle(title); | 165 controller->GetActiveEntry()->SetTitle(title); |
166 } | 166 } |
167 | 167 |
168 void BrowserWithTestWindowTest::DestroyBrowserAndProfile() { | 168 void BrowserWithTestWindowTest::DestroyBrowserAndProfile() { |
169 if (browser_.get()) { | 169 if (browser_.get()) { |
170 // Make sure we close all tabs, otherwise Browser isn't happy in its | 170 // Make sure we close all tabs, otherwise Browser isn't happy in its |
171 // destructor. | 171 // destructor. |
(...skipping 23 matching lines...) Expand all Loading... |
195 } | 195 } |
196 | 196 |
197 Browser* BrowserWithTestWindowTest::CreateBrowser( | 197 Browser* BrowserWithTestWindowTest::CreateBrowser( |
198 Profile* profile, | 198 Profile* profile, |
199 chrome::HostDesktopType host_desktop_type, | 199 chrome::HostDesktopType host_desktop_type, |
200 BrowserWindow* browser_window) { | 200 BrowserWindow* browser_window) { |
201 Browser::CreateParams params(profile, host_desktop_type); | 201 Browser::CreateParams params(profile, host_desktop_type); |
202 params.window = browser_window; | 202 params.window = browser_window; |
203 return new Browser(params); | 203 return new Browser(params); |
204 } | 204 } |
OLD | NEW |