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

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

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years 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) 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
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
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 }
OLDNEW
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.h ('k') | chrome/test/base/in_process_browser_test_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698