diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 22:47:13 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 22:47:13 +0000 |
| commit | c8579842d01f4301607eace4412ef70dfd5e4278 (patch) | |
| tree | 83f57c933ebf5114f9048758482e730e619e97b0 /content | |
| parent | e46617f1a3089f5e9482b5228e5af56cd87f1bd0 (diff) | |
| download | chromium_src-c8579842d01f4301607eace4412ef70dfd5e4278.zip chromium_src-c8579842d01f4301607eace4412ef70dfd5e4278.tar.gz chromium_src-c8579842d01f4301607eace4412ef70dfd5e4278.tar.bz2 | |
[content shell] rip out code that moves windows off screen during layout tests
It just makes debugging difficult
BUG=111316
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10857057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/shell_gtk.cc | 5 | ||||
| -rw-r--r-- | content/shell/shell_mac.mm | 6 | ||||
| -rw-r--r-- | content/shell/shell_win.cc | 11 |
3 files changed, 2 insertions, 20 deletions
diff --git a/content/shell/shell_gtk.cc b/content/shell/shell_gtk.cc index cc181a2..6261b80 100644 --- a/content/shell/shell_gtk.cc +++ b/content/shell/shell_gtk.cc @@ -7,7 +7,6 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "base/command_line.h" #include "base/logging.h" #include "base/string_piece.h" #include "base/utf_string_conversions.h" @@ -18,7 +17,6 @@ #include "content/public/common/renderer_preferences.h" #include "content/shell/shell_browser_context.h" #include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_switches.h" #include "third_party/skia/include/core/SkColor.h" namespace content { @@ -186,9 +184,6 @@ void Shell::PlatformCreateWindow(int width, int height) { gtk_container_add(GTK_CONTAINER(window_), vbox_); gtk_widget_show_all(GTK_WIDGET(window_)); - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) - gtk_widget_set_uposition(GTK_WIDGET(window_), 10000, 10000); - SizeTo(width, height); } diff --git a/content/shell/shell_mac.mm b/content/shell/shell_mac.mm index 065bf9c..cf97720 100644 --- a/content/shell/shell_mac.mm +++ b/content/shell/shell_mac.mm @@ -6,7 +6,6 @@ #include <algorithm> -#include "base/command_line.h" #include "base/logging.h" #import "base/memory/scoped_nsobject.h" #include "base/string_piece.h" @@ -15,7 +14,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/shell/resource.h" -#include "content/shell/shell_switches.h" #include "googleurl/src/gurl.h" #import "ui/base/cocoa/underlay_opengl_hosting_window.h" @@ -180,10 +178,6 @@ void Shell::PlatformCreateWindow(int width, int height) { NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask; - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { - content_rect = NSOffsetRect(initial_window_bounds, -10000, -10000); - style_mask = NSBorderlessWindowMask; - } CrShellWindow* window = [[CrShellWindow alloc] initWithContentRect:content_rect styleMask:style_mask diff --git a/content/shell/shell_win.cc b/content/shell/shell_win.cc index 125887e..9b88b61 100644 --- a/content/shell/shell_win.cc +++ b/content/shell/shell_win.cc @@ -9,13 +9,11 @@ #include <io.h> #include <windows.h> -#include "base/command_line.h" #include "base/utf_string_conversions.h" #include "base/win/wrapped_window_proc.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/shell/resource.h" -#include "content/shell/shell_switches.h" #include "ui/base/win/hwnd_util.h" namespace { @@ -155,13 +153,8 @@ void Shell::SizeTo(int width, int height) { // Add space for the url bar. window_height += kURLBarHeight; - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { - SetWindowPos(window_, NULL, -window_width, -window_height, - window_width, window_height, SWP_NOZORDER); - } else { - SetWindowPos(window_, NULL, 0, 0, window_width, window_height, - SWP_NOMOVE | SWP_NOZORDER); - } + SetWindowPos(window_, NULL, 0, 0, window_width, window_height, + SWP_NOMOVE | SWP_NOZORDER); } void Shell::PlatformResizeSubViews() { |