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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 browser_context, 251 browser_context,
252 GURL(), 252 GURL(),
253 NULL, 253 NULL,
254 MSG_ROUTING_NONE, 254 MSG_ROUTING_NONE,
255 initial_size_); 255 initial_size_);
256 WebContentsObserver::Observe(main_window_->web_contents()); 256 WebContentsObserver::Observe(main_window_->web_contents());
257 send_configuration_to_next_host_ = true; 257 send_configuration_to_next_host_ = true;
258 current_pid_ = base::kNullProcessId; 258 current_pid_ = base::kNullProcessId;
259 main_window_->LoadURL(test_url); 259 main_window_->LoadURL(test_url);
260 } else { 260 } else {
261 #if defined(TOOLKIT_GTK) || defined(OS_MACOSX) 261 #if defined(OS_MACOSX)
262 // Shell::SizeTo is not implemented on all platforms. 262 // Shell::SizeTo is not implemented on all platforms.
263 main_window_->SizeTo(initial_size_); 263 main_window_->SizeTo(initial_size_);
264 #endif 264 #endif
265 main_window_->web_contents()->GetRenderViewHost()->GetView() 265 main_window_->web_contents()->GetRenderViewHost()->GetView()
266 ->SetSize(initial_size_); 266 ->SetSize(initial_size_);
267 main_window_->web_contents()->GetRenderViewHost()->WasResized(); 267 main_window_->web_contents()->GetRenderViewHost()->WasResized();
268 RenderViewHost* render_view_host = 268 RenderViewHost* render_view_host =
269 main_window_->web_contents()->GetRenderViewHost(); 269 main_window_->web_contents()->GetRenderViewHost();
270 WebPreferences prefs = render_view_host->GetWebkitPreferences(); 270 WebPreferences prefs = render_view_host->GetWebkitPreferences();
271 OverrideWebkitPrefs(&prefs); 271 OverrideWebkitPrefs(&prefs);
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 return; 671 return;
672 } 672 }
673 673
674 printer_->AddErrorMessage( 674 printer_->AddErrorMessage(
675 base::StringPrintf("#LEAK - renderer pid %d (%s)", current_pid_, 675 base::StringPrintf("#LEAK - renderer pid %d (%s)", current_pid_,
676 result.detail.c_str())); 676 result.detail.c_str()));
677 DiscardMainWindow(); 677 DiscardMainWindow();
678 } 678 }
679 679
680 } // namespace content 680 } // namespace content
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698