Revert 205772 "Revert "Revert 205443 "headless windows content_s..."

trunk/src/content/shell/shell_win.cc

Index: trunk/src/content/shell/shell_win.cc
===================================================================
--- trunk/src/content/shell/shell_win.cc	(revision 205774)
+++ trunk/src/content/shell/shell_win.cc	(working copy)
@@ -57,8 +57,6 @@
 }
 
 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
-  if (headless_)
-    return;
   int id;
   switch (control) {
     case BACK_BUTTON:
@@ -78,8 +76,6 @@
 }
 
 void Shell::PlatformSetAddressBarURL(const GURL& url) {
-  if (headless_)
-    return;
   std::wstring url_string = UTF8ToWide(url.spec());
   SendMessage(url_edit_view_, WM_SETTEXT, 0,
               reinterpret_cast<LPARAM>(url_string.c_str()));
@@ -89,8 +85,6 @@
 }
 
 void Shell::PlatformCreateWindow(int width, int height) {
-  if (headless_)
-    return;
   window_ = CreateWindow(kWindowClass, kWindowTitle,
                          WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
                          CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
@@ -140,14 +134,10 @@
 }
 
 void Shell::PlatformSetContents() {
-  if (headless_)
-    return;
   SetParent(web_contents_->GetView()->GetNativeView(), window_);
 }
 
 void Shell::SizeTo(int width, int height) {
-  if (headless_)
-    return;
   RECT rc, rw;
   GetClientRect(window_, &rc);
   GetWindowRect(window_, &rw);
@@ -168,8 +158,6 @@
 }
 
 void Shell::PlatformResizeSubViews() {
-  if (headless_)
-    return;
   RECT rc;
   GetClientRect(window_, &rc);
 
@@ -181,10 +169,6 @@
 }
 
 void Shell::Close() {
-  if (headless_) {
-    delete this;
-    return;
-  }
   DestroyWindow(window_);
 }
 
@@ -215,8 +199,6 @@
       int id = LOWORD(wParam);
       switch (id) {
         case IDM_NEW_WINDOW:
-          if (shell->headless_)
-            return 0;
           CreateNewWindow(
               shell->web_contents()->GetBrowserContext(),
               GURL(), NULL, MSG_ROUTING_NONE, gfx::Size());
@@ -297,8 +279,6 @@
 }
 
 void Shell::PlatformSetTitle(const string16& text) {
-  if (headless_)
-    return;
   ::SetWindowText(window_, text.c_str());
 }