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

Side by Side Diff: content/shell/browser/webkit_test_controller.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/shell.cc ('k') | content/test/content_browser_test_utils_internal.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/shell/browser/webkit_test_controller.h" 5 #include "content/shell/browser/webkit_test_controller.h"
6 6
7 #include <iostream> 7 #include <iostream>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 ->SetSize(initial_size_); 274 ->SetSize(initial_size_);
275 main_window_->web_contents()->GetRenderViewHost()->WasResized(); 275 main_window_->web_contents()->GetRenderViewHost()->WasResized();
276 RenderViewHost* render_view_host = 276 RenderViewHost* render_view_host =
277 main_window_->web_contents()->GetRenderViewHost(); 277 main_window_->web_contents()->GetRenderViewHost();
278 WebPreferences prefs = render_view_host->GetWebkitPreferences(); 278 WebPreferences prefs = render_view_host->GetWebkitPreferences();
279 OverrideWebkitPrefs(&prefs); 279 OverrideWebkitPrefs(&prefs);
280 render_view_host->UpdateWebkitPreferences(prefs); 280 render_view_host->UpdateWebkitPreferences(prefs);
281 SendTestConfiguration(); 281 SendTestConfiguration();
282 282
283 NavigationController::LoadURLParams params(test_url); 283 NavigationController::LoadURLParams params(test_url);
284 params.transition_type = PageTransitionFromInt( 284 params.transition_type = ui::PageTransitionFromInt(
285 PAGE_TRANSITION_TYPED | PAGE_TRANSITION_FROM_ADDRESS_BAR); 285 ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
286 params.should_clear_history_list = true; 286 params.should_clear_history_list = true;
287 main_window_->web_contents()->GetController().LoadURLWithParams(params); 287 main_window_->web_contents()->GetController().LoadURLWithParams(params);
288 main_window_->web_contents()->Focus(); 288 main_window_->web_contents()->Focus();
289 } 289 }
290 main_window_->web_contents()->GetRenderViewHost()->SetActive(true); 290 main_window_->web_contents()->GetRenderViewHost()->SetActive(true);
291 main_window_->web_contents()->GetRenderViewHost()->Focus(); 291 main_window_->web_contents()->GetRenderViewHost()->Focus();
292 return true; 292 return true;
293 } 293 }
294 294
295 bool WebKitTestController::ResetAfterLayoutTest() { 295 bool WebKitTestController::ResetAfterLayoutTest() {
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 687
688 printer_->AddErrorMessage( 688 printer_->AddErrorMessage(
689 base::StringPrintf("#LEAK - renderer pid %d (%s)", current_pid_, 689 base::StringPrintf("#LEAK - renderer pid %d (%s)", current_pid_,
690 result.detail.c_str())); 690 result.detail.c_str()));
691 CHECK(!crash_when_leak_found_); 691 CHECK(!crash_when_leak_found_);
692 692
693 DiscardMainWindow(); 693 DiscardMainWindow();
694 } 694 }
695 695
696 } // namespace content 696 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell.cc ('k') | content/test/content_browser_test_utils_internal.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698