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

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

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/test_location_bar.cc ('k') | chrome/tools/profiles/generate_profile.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/base/ui_test_utils.h" 5 #include "chrome/test/base/ui_test_utils.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 for (std::vector<Browser*>::const_iterator iter = BrowserList::begin(); 347 for (std::vector<Browser*>::const_iterator iter = BrowserList::begin();
348 iter != BrowserList::end(); 348 iter != BrowserList::end();
349 ++iter) { 349 ++iter) {
350 initial_browsers.insert(*iter); 350 initial_browsers.insert(*iter);
351 } 351 }
352 352
353 WindowedNotificationObserver tab_added_observer( 353 WindowedNotificationObserver tab_added_observer(
354 content::NOTIFICATION_TAB_ADDED, 354 content::NOTIFICATION_TAB_ADDED,
355 NotificationService::AllSources()); 355 NotificationService::AllSources());
356 356
357 browser->OpenURL(url, GURL(), disposition, PageTransition::TYPED); 357 browser->OpenURL(url, GURL(), disposition, content::PAGE_TRANSITION_TYPED);
358 if (browser_test_flags & BROWSER_TEST_WAIT_FOR_BROWSER) 358 if (browser_test_flags & BROWSER_TEST_WAIT_FOR_BROWSER)
359 browser = WaitForBrowserNotInSet(initial_browsers); 359 browser = WaitForBrowserNotInSet(initial_browsers);
360 if (browser_test_flags & BROWSER_TEST_WAIT_FOR_TAB) 360 if (browser_test_flags & BROWSER_TEST_WAIT_FOR_TAB)
361 tab_added_observer.Wait(); 361 tab_added_observer.Wait();
362 if (!(browser_test_flags & BROWSER_TEST_WAIT_FOR_NAVIGATION)) { 362 if (!(browser_test_flags & BROWSER_TEST_WAIT_FOR_NAVIGATION)) {
363 // Some other flag caused the wait prior to this. 363 // Some other flag caused the wait prior to this.
364 return; 364 return;
365 } 365 }
366 TabContents* tab_contents = NULL; 366 TabContents* tab_contents = NULL;
367 if (disposition == NEW_BACKGROUND_TAB) { 367 if (disposition == NEW_BACKGROUND_TAB) {
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 return taker.TakeRenderWidgetSnapshot(rwh, page_size, page_size, bitmap); 987 return taker.TakeRenderWidgetSnapshot(rwh, page_size, page_size, bitmap);
988 } 988 }
989 989
990 bool TakeEntirePageSnapshot(RenderViewHost* rvh, SkBitmap* bitmap) { 990 bool TakeEntirePageSnapshot(RenderViewHost* rvh, SkBitmap* bitmap) {
991 DCHECK(bitmap); 991 DCHECK(bitmap);
992 SnapshotTaker taker; 992 SnapshotTaker taker;
993 return taker.TakeEntirePageSnapshot(rvh, bitmap); 993 return taker.TakeEntirePageSnapshot(rvh, bitmap);
994 } 994 }
995 995
996 } // namespace ui_test_utils 996 } // namespace ui_test_utils
OLDNEW
« no previous file with comments | « chrome/test/base/test_location_bar.cc ('k') | chrome/tools/profiles/generate_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698