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

Side by Side Diff: content/test/content_browser_test_utils_internal.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
« no previous file with comments | « content/shell/browser/webkit_test_controller.cc ('k') | content/test/test_render_frame_host.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/test/content_browser_test_utils_internal.h" 5 #include "content/test/content_browser_test_utils_internal.h"
6 6
7 #include "content/browser/frame_host/frame_tree_node.h" 7 #include "content/browser/frame_host/frame_tree_node.h"
8 #include "content/browser/frame_host/navigator.h" 8 #include "content/browser/frame_host/navigator.h"
9 #include "content/test/test_frame_navigation_observer.h" 9 #include "content/test/test_frame_navigation_observer.h"
10 #include "url/gurl.h" 10 #include "url/gurl.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 void NavigateFrameToURL(FrameTreeNode* node, const GURL& url) { 14 void NavigateFrameToURL(FrameTreeNode* node, const GURL& url) {
15 TestFrameNavigationObserver observer(node); 15 TestFrameNavigationObserver observer(node);
16 NavigationController::LoadURLParams params(url); 16 NavigationController::LoadURLParams params(url);
17 params.transition_type = PageTransitionFromInt(PAGE_TRANSITION_LINK); 17 params.transition_type = ui::PAGE_TRANSITION_LINK;
18 params.frame_tree_node_id = node->frame_tree_node_id(); 18 params.frame_tree_node_id = node->frame_tree_node_id();
19 node->navigator()->GetController()->LoadURLWithParams(params); 19 node->navigator()->GetController()->LoadURLWithParams(params);
20 observer.Wait(); 20 observer.Wait();
21 } 21 }
22 22
23 } // namespace content 23 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/webkit_test_controller.cc ('k') | content/test/test_render_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698