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

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

Issue 10698068: chrome: Put browser_navigator.h into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: already in chrome namespace Created 8 years, 5 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/base/ui_test_utils.h ('k') | chrome/test/ui/ppapi_uitest.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) 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/ui_test_utils.h" 5 #include "chrome/test/base/ui_test_utils.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 } 398 }
399 399
400 void OpenURLOffTheRecord(Profile* profile, const GURL& url) { 400 void OpenURLOffTheRecord(Profile* profile, const GURL& url) {
401 chrome::OpenURLOffTheRecord(profile, url); 401 chrome::OpenURLOffTheRecord(profile, url);
402 Browser* browser = browser::FindTabbedBrowser( 402 Browser* browser = browser::FindTabbedBrowser(
403 profile->GetOffTheRecordProfile(), false); 403 profile->GetOffTheRecordProfile(), false);
404 WaitForNavigations(&chrome::GetActiveWebContents(browser)->GetController(), 404 WaitForNavigations(&chrome::GetActiveWebContents(browser)->GetController(),
405 1); 405 1);
406 } 406 }
407 407
408 void NavigateToURL(browser::NavigateParams* params) { 408 void NavigateToURL(chrome::NavigateParams* params) {
409 content::TestNavigationObserver observer( 409 content::TestNavigationObserver observer(
410 content::NotificationService::AllSources(), NULL, 1); 410 content::NotificationService::AllSources(), NULL, 1);
411 browser::Navigate(params); 411 chrome::Navigate(params);
412 base::RunLoop run_loop; 412 base::RunLoop run_loop;
413 observer.WaitForObservation( 413 observer.WaitForObservation(
414 base::Bind(&ui_test_utils::RunThisRunLoop, base::Unretained(&run_loop)), 414 base::Bind(&ui_test_utils::RunThisRunLoop, base::Unretained(&run_loop)),
415 ui_test_utils::GetQuitTaskForRunLoop(&run_loop)); 415 ui_test_utils::GetQuitTaskForRunLoop(&run_loop));
416 } 416 }
417 417
418 void NavigateToURL(Browser* browser, const GURL& url) { 418 void NavigateToURL(Browser* browser, const GURL& url) {
419 NavigateToURLWithDisposition(browser, url, CURRENT_TAB, 419 NavigateToURLWithDisposition(browser, url, CURRENT_TAB,
420 BROWSER_TEST_WAIT_FOR_NAVIGATION); 420 BROWSER_TEST_WAIT_FOR_NAVIGATION);
421 } 421 }
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 int state, 1289 int state,
1290 const base::Closure& followup) { 1290 const base::Closure& followup) {
1291 if (!followup.is_null()) 1291 if (!followup.is_null())
1292 ui_controls::SendMouseEventsNotifyWhenDone(button, state, followup); 1292 ui_controls::SendMouseEventsNotifyWhenDone(button, state, followup);
1293 else 1293 else
1294 ui_controls::SendMouseEvents(button, state); 1294 ui_controls::SendMouseEvents(button, state);
1295 } 1295 }
1296 1296
1297 } // namespace internal 1297 } // namespace internal
1298 } // namespace ui_test_utils 1298 } // namespace ui_test_utils
OLDNEW
« no previous file with comments | « chrome/test/base/ui_test_utils.h ('k') | chrome/test/ui/ppapi_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698