Exclude dev tools bounds from views dialog hosting bounds.

chrome/browser/ui/views/frame/browser_view_layout.cc

 // Copyright 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 "chrome/browser/ui/views/frame/browser_view_layout.h"
 
 #include "base/observer_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 49 matching lines @@
 
 class BrowserViewLayout::WebContentsModalDialogHostViews
     : public WebContentsModalDialogHost {
  public:
   explicit WebContentsModalDialogHostViews(
       BrowserViewLayout* browser_view_layout)
           : browser_view_layout_(browser_view_layout) {
   }
 
   virtual ~WebContentsModalDialogHostViews() {
-    FOR_EACH_OBSERVER(web_modal::ModalDialogHostObserver,
+    FOR_EACH_OBSERVER(ModalDialogHostObserver,
                       observer_list_,
                       OnHostDestroying());
   }
 
   void NotifyPositionRequiresUpdate() {
     FOR_EACH_OBSERVER(ModalDialogHostObserver,
                       observer_list_,
                       OnPositionRequiresUpdate());
   }
 
-  // Center horizontally over the content area, with the top overlapping the
-  // browser chrome.
   virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE {
-    int top_y = browser_view_layout_->web_contents_modal_dialog_top_y_;
-    views::View* contents_container =
-        browser_view_layout_->contents_container_;
-    gfx::Rect contents_container_bounds_in_widget =
-        contents_container->ConvertRectToWidget(
-            contents_container->GetLocalBounds());
-    int middle_x = contents_container_bounds_in_widget.x() +
-        contents_container_bounds_in_widget.width() / 2;
-    return gfx::Point(middle_x - size.width() / 2, top_y);
+    views::View* view = browser_view_layout_->delegate_->GetContentsWebView();
+    gfx::Rect content_area = view->ConvertRectToWidget(view->GetLocalBounds());
+    const int middle_x = content_area.x() + content_area.width() / 2;
+    const int top = browser_view_layout_->web_contents_modal_dialog_top_y_;
+    return gfx::Point(middle_x - size.width() / 2, top);
+  }
+
+  virtual gfx::Size GetMaximumDialogSize() OVERRIDE {
+    views::View* view = browser_view_layout_->delegate_->GetContentsWebView();
+    gfx::Rect content_area = view->ConvertRectToWidget(view->GetLocalBounds());
+    const int top = browser_view_layout_->web_contents_modal_dialog_top_y_;
+    return gfx::Size(content_area.width(), content_area.bottom() - top);
   }
 
  private:
   virtual gfx::NativeView GetHostView() const OVERRIDE {
-    gfx::NativeWindow native_window =
+    gfx::NativeWindow window =
         browser_view_layout_->browser()->window()->GetNativeWindow();
-    return views::Widget::GetWidgetForNativeWindow(native_window)->
-        GetNativeView();
-  }
-
-  virtual gfx::Size GetMaximumDialogSize() OVERRIDE {
-    gfx::Rect content_area =
-        browser_view_layout_->contents_container_->ConvertRectToWidget(
-            browser_view_layout_->contents_container_->GetLocalBounds());
-
-    gfx::Size max_dialog_size = content_area.size();
-    // Adjust for difference in alignment between the dialog top and the top of
-    // the content area.
-    int height_offset = content_area.y() -
-        browser_view_layout_->web_contents_modal_dialog_top_y_;
-    max_dialog_size.Enlarge(0, height_offset);
-    return max_dialog_size;
+    return views::Widget::GetWidgetForNativeWindow(window)->GetNativeView();
   }
 
   // Add/remove observer.
-  virtual void AddObserver(
-      ModalDialogHostObserver* observer) OVERRIDE {
+  virtual void AddObserver(ModalDialogHostObserver* observer) OVERRIDE {
     observer_list_.AddObserver(observer);
   }
-  virtual void RemoveObserver(
-      ModalDialogHostObserver* observer) OVERRIDE {
+  virtual void RemoveObserver(ModalDialogHostObserver* observer) OVERRIDE {
     observer_list_.RemoveObserver(observer);
   }
 
   BrowserViewLayout* const browser_view_layout_;
 
   ObserverList<ModalDialogHostObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsModalDialogHostViews);
 };
 
@@ skipping 247 matching lines @@
   }
 
   // Adjust the fullscreen exit bubble bounds for |top_container_|'s new bounds.
   // This makes the fullscreen exit bubble look like it animates with
   // |top_container_| in immersive fullscreen.
   FullscreenExitBubbleViews* fullscreen_exit_bubble =
       delegate_->GetFullscreenExitBubble();
   if (fullscreen_exit_bubble)
     fullscreen_exit_bubble->RepositionIfVisible();
 
-  // Adjust any hosted dialogs if the browser's dialog positioning has changed.
-  if (dialog_host_->GetDialogPosition(gfx::Size()) != latest_dialog_position_) {
-    latest_dialog_position_ = dialog_host_->GetDialogPosition(gfx::Size());
+  // Adjust any hosted dialogs if the browser's dialog hosting bounds changed.
+  const gfx::Rect dialog_bounds(dialog_host_->GetDialogPosition(gfx::Size()),
+                                dialog_host_->GetMaximumDialogSize());
+  if (latest_dialog_bounds_ != dialog_bounds) {
+    latest_dialog_bounds_ = dialog_bounds;
     dialog_host_->NotifyPositionRequiresUpdate();
   }
 }
 
 // Return the preferred size which is the size required to give each
 // children their respective preferred size.
 gfx::Size BrowserViewLayout::GetPreferredSize(views::View* host) {
   return gfx::Size();
 }
 
@@ skipping 175 matching lines @@
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // Cast to a views::View to access GetPreferredSize().
   views::View* infobar_container = infobar_container_;
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser_->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container->GetPreferredSize().height() != 0);
 }