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

trunk/src/content/shell/shell_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/shell.h"
 
 #include <commctrl.h>
 #include <fcntl.h>
 #include <io.h>
 #include <windows.h>
@@ skipping 39 matching lines @@
 }
 
 void Shell::PlatformCleanUp() {
   // When the window is destroyed, tell the Edit field to forget about us,
   // otherwise we will crash.
   ui::SetWindowProc(url_edit_view_, default_edit_wnd_proc_);
   ui::SetWindowUserData(url_edit_view_, NULL);
 }
 
 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
-  if (headless_)
-    return;
   int id;
   switch (control) {
     case BACK_BUTTON:
       id = IDC_NAV_BACK;
       break;
     case FORWARD_BUTTON:
       id = IDC_NAV_FORWARD;
       break;
     case STOP_BUTTON:
       id = IDC_NAV_STOP;
       break;
     default:
       NOTREACHED() << "Unknown UI control";
       return;
   }
   EnableWindow(GetDlgItem(window_, id), is_enabled);
 }
 
 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()));
 }
 
 void Shell::PlatformSetIsLoading(bool loading) {
 }
 
 void Shell::PlatformCreateWindow(int width, int height) {
-  if (headless_)
-    return;
   window_ = CreateWindow(kWindowClass, kWindowTitle,
                          WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
                          CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
                          NULL, NULL, instance_handle_, NULL);
   ui::SetWindowUserData(window_, this);
 
   HWND hwnd;
   int x = 0;
 
   hwnd = CreateWindow(L"BUTTON", L"Back",
@@ skipping 29 matching lines @@
   default_edit_wnd_proc_ = ui::SetWindowProc(url_edit_view_,
                                              Shell::EditWndProc);
   ui::SetWindowUserData(url_edit_view_, this);
 
   ShowWindow(window_, SW_SHOW);
 
   SizeTo(width, height);
 }
 
 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);
 
   int client_width = rc.right - rc.left;
   int window_width = rw.right - rw.left;
   window_width = (window_width - client_width) + width;
 
   int client_height = rc.bottom - rc.top;
   int window_height = rw.bottom - rw.top;
   window_height = (window_height - client_height) + height;
 
   // Add space for the url bar.
   window_height += kURLBarHeight;
 
   SetWindowPos(window_, NULL, 0, 0, window_width, window_height,
                SWP_NOMOVE | SWP_NOZORDER);
 }
 
 void Shell::PlatformResizeSubViews() {
-  if (headless_)
-    return;
   RECT rc;
   GetClientRect(window_, &rc);
 
   int x = kButtonWidth * 4;
   MoveWindow(url_edit_view_, x, 0, rc.right - x, kURLBarHeight, TRUE);
 
   MoveWindow(GetContentView(), 0, kURLBarHeight, rc.right,
              rc.bottom - kURLBarHeight, TRUE);
 }
 
 void Shell::Close() {
-  if (headless_) {
-    delete this;
-    return;
-  }
   DestroyWindow(window_);
 }
 
 ATOM Shell::RegisterWindowClass() {
   WNDCLASSEX window_class;
   base::win::InitializeWindowClass(
       kWindowClass,
       &Shell::WndProc,
       CS_HREDRAW | CS_VREDRAW,
       0,
@@ skipping 10 matching lines @@
 
 LRESULT CALLBACK Shell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
                                 LPARAM lParam) {
   Shell* shell = static_cast<Shell*>(ui::GetWindowUserData(hwnd));
 
   switch (message) {
     case WM_COMMAND: {
       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());
           break;
         case IDM_CLOSE_WINDOW:
           DestroyWindow(hwnd);
           break;
         case IDM_EXIT:
           PlatformExit();
           break;
@@ skipping 60 matching lines @@
 
         return 0;
       }
   }
 
   return CallWindowProc(shell->default_edit_wnd_proc_, hwnd, message, wParam,
                         lParam);
 }
 
 void Shell::PlatformSetTitle(const string16& text) {
-  if (headless_)
-    return;
   ::SetWindowText(window_, text.c_str());
 }
 
 }  // namespace content