Fix problem with popups frames when magic_browzr....

chrome/browser/views/constrained_window_impl.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/views/constrained_window_impl.h"
 
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/tab_contents.h"
@@ skipping 1165 matching lines @@
 
   // We want to detach the constrained window at the same position on screen
   // as the constrained window, so we need to get its screen bounds.
   CRect constrained_window_bounds;
   GetBounds(&constrained_window_bounds, true);
 
   // Obtain the constrained TabContents' size from its HWND...
   CRect bounds;
   ::GetWindowRect(constrained_contents_->GetContainerHWND(), &bounds);
 
-  // ... but overwrite its screen position with the screen position of its
-  // containing ConstrainedWindowImpl. We do this because the code called by
-  // |DetachContents| assumes the bounds contains position and size information
-  // similar to what is sent when a popup is not suppressed and must be opened,
-  // i.e. the position is the screen position of the top left of the detached
-  // popup window, and the size is the size of the content area.
-  bounds.SetRect(constrained_window_bounds.left, constrained_window_bounds.top,
-                 constrained_window_bounds.left + bounds.Width(),
-                 constrained_window_bounds.top + bounds.Height());
+  // This block of code was added by Ben, and is simply false in any world with
+  // magic_browzr turned off. Eventually, the if block here should go away once
+  // we get rid of the old pre-magic_browzr window implementation, but for now
+  // (and at least the next beta release), it's here to stay and magic_browzr
+  // is off by default.
+  if (g_browser_process->IsUsingNewFrames()) {
+    // ... but overwrite its screen position with the screen position of its
+    // containing ConstrainedWindowImpl. We do this because the code called by
+    // |DetachContents| assumes the bounds contains position and size
+    // information similar to what is sent when a popup is not suppressed and
+    // must be opened, i.e. the position is the screen position of the top left
+    // of the detached popup window, and the size is the size of the content
+    // area.
+    bounds.SetRect(constrained_window_bounds.left,
+                   constrained_window_bounds.top,
+                   constrained_window_bounds.left + bounds.Width(),
+                   constrained_window_bounds.top + bounds.Height());
+  }
 
   // Save the cursor position so that we know where to send a mouse message
   // when the new detached window is created.
   CPoint cursor_pos;
   ::GetCursorPos(&cursor_pos);
   gfx::Point screen_point(cursor_pos.x, cursor_pos.y);
 
   // Determine what aspect of the constrained frame was clicked on, so that we
   // can continue the mouse move on this aspect of the detached frame.
   int frame_component = static_cast<int>(OnNCHitTest(screen_point.ToPOINT()));
@@ skipping 157 matching lines @@
           initial_bounds,
           parent->delegate()->ShouldDisplayURLField());
 
   window->InitSizeForContents(window_bounds);
 
   // This is a constrained popup window and thus we need to animate it in.
   window->StartSuppressedAnimation();
 
   return window;
 }