Merge r11424...

chrome/views/client_view.h

 // 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.
 
 #ifndef CHROME_VIEWS_CLIENT_VIEW_H_
 #define CHROME_VIEWS_CLIENT_VIEW_H_
 
 #include "chrome/views/view.h"
 
 namespace views {
@@ skipping 37 matching lines @@
   // HTNOWHERE to tell the caller to do further processing to determine where
   // in the non-client area it is (if it is).
   // Subclasses of ClientView can extend this logic by overriding this method
   // to detect if regions within the client area count as parts of the "non-
   // client" area. A good example of this is the size box at the bottom right
   // corner of resizable dialog boxes.
   virtual int NonClientHitTest(const gfx::Point& point);
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize();
+  virtual void Layout();
 
  protected:
   // Overridden from View:
   virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
-  virtual void Layout();
+  virtual void DidChangeBounds(const gfx::Rect& previous,
+                               const gfx::Rect& current);
 
   // Accessors for private data members.
   Window* window() const { return window_; }
   void set_window(Window* window) { window_ = window; }
   View* contents_view() const { return contents_view_; }
   void set_contents_view(View* contents_view) {
     contents_view_ = contents_view;
   }
 
  private:
   // The Window that hosts this ClientView.
   Window* window_;
 
   // The View that this ClientView contains.
   View* contents_view_;
 };
 
 }  // namespace views
 
 #endif  // #ifndef CHROME_VIEWS_CLIENT_VIEW_H_