content/shell/browser/webkit_test_controller.cc - Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/browser/webkit_test_controller.cc

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/shell/browser/shell_resource_dispatcher_host_delegate.cc ('k') | content/shell/renderer/test_runner/event_sender.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/webkit_test_controller.cc

diff --git a/content/shell/browser/webkit_test_controller.cc b/content/shell/browser/webkit_test_controller.cc

index 4932e58887eb7da817545bc3334ca2b47fd27a75..fe53946a3ac79454c6d8edbce6e16f9d9ceaaecf 100644

--- a/content/shell/browser/webkit_test_controller.cc

+++ b/content/shell/browser/webkit_test_controller.cc

@@ -258,7 +258,7 @@ bool WebKitTestController::PrepareForLayoutTest(

current_pid_ = base::kNullProcessId;

main_window_->LoadURL(test_url);

} else {

-#if defined(TOOLKIT_GTK) || defined(OS_MACOSX)

+#if defined(OS_MACOSX)

// Shell::SizeTo is not implemented on all platforms.

main_window_->SizeTo(initial_size_);

#endif