From 4f3dc3751d69f9db1f8ef533a3335201b3bc78bc Mon Sep 17 00:00:00 2001 From: "finnur@google.com" Date: Tue, 24 Feb 2009 00:10:29 +0000 Subject: The find bar should be owned and managed from the BrowserView, not the WebContentsView, since it's part of the "chrome". Design Doc: http://dev.chromium.org/developers/design-documents/find-bar Things done: - Pulled all of the find bar stuff out of WebContentsView* since it's no longer needed. - Moved OnFindReply delegate method from RenderViewHostDelegate::View to RenderViewHostDelegate, since it's no longer implemented on the view. - Moved find control methods to WebContents. - Added recent find result state to WebContents. - Updated the UI tests to accommodate the changes in the state that is broadcast when results are discovered. - Updated the find bar layout to obtain its bounding box from the BrowserView, which knows about toolbars, bookmark bars etc. - Updated the find bar itself to handle the fact that it can be displayed for multiple different tabs. - Moved the find bar manipulation methods for testing from TabProxy to BrowserProxy, since the find bar is now a feature of the window, not the tab. - view.h: Don't lay out child views again if they have a layout manager, it already updated them. TEST=Find box should work as before. BUG=3245 Review URL: http://codereview.chromium.org/27025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10231 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/views/view.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'chrome/views') diff --git a/chrome/views/view.cc b/chrome/views/view.cc index 0385df4..c61cbbd 100644 --- a/chrome/views/view.cc +++ b/chrome/views/view.cc @@ -57,7 +57,7 @@ class RestoreFocusTask : public Task { // The target view. View* view_; - DISALLOW_EVIL_CONSTRUCTORS(RestoreFocusTask); + DISALLOW_COPY_AND_ASSIGN(RestoreFocusTask); }; ///////////////////////////////////////////////////////////////////////////// @@ -71,7 +71,7 @@ View::View() group_(-1), enabled_(true), focusable_(false), - bounds_(0,0,0,0), + bounds_(0, 0, 0, 0), parent_(NULL), should_restore_focus_(false), is_visible_(true), @@ -117,7 +117,7 @@ gfx::Rect View::GetBounds(PositionMirroringSettings settings) const { // rectangle appropriately. if (settings == APPLY_MIRRORING_TRANSFORMATION) bounds.set_x(MirroredX()); - + return bounds; } @@ -206,6 +206,7 @@ void View::Layout() { if (layout_manager_.get()) { layout_manager_->Layout(this); SchedulePaint(); + return; } // Lay out contents of child Views @@ -441,7 +442,7 @@ void View::ShowContextMenu(int x, int y, bool is_mouse_gesture) { if (!context_menu_controller_) return; - context_menu_controller_->ShowContextMenu(this, x, y, is_mouse_gesture); + context_menu_controller_->ShowContextMenu(this, x, y, is_mouse_gesture); } ///////////////////////////////////////////////////////////////////////////// -- cgit v1.1