View API/implementation cleanup:...

ui/views/demo/main.cc

 // Copyright (c) 2011 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 <windows.h>
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 
@@ skipping 70 matching lines @@
       : ColorView(SK_ColorMAGENTA),
         c1_(new ColorView(SK_ColorGREEN)),
         c2_(new ColorView(SK_ColorRED)) {
     AddChildView(c1_);
     AddChildView(c2_);
   }
   virtual ~FancyPantsView() {}
 
   // Overridden from ui::View:
   virtual void Layout() {
-    c1_->SetBounds(20, 20, width() - 40, height() - 40);
-    c2_->SetBounds(50, 50, 50, 50);
+    c1_->SetBounds(gfx::Rect(20, 20, std::max(width() - 40, 0),
+                             std::max(height() - 40, 0)));
+    c2_->SetBounds(gfx::Rect(50, 50, 50, 50));
     Invalidate();
   }
   virtual bool OnMousePressed(const ui::MouseEvent& event) {
     old_color_ = color();
     set_color(SK_ColorWHITE);
     mouse_offset_ = event.location();
     return true;
   }
   virtual bool OnMouseDragged(const ui::MouseEvent& event) {
     gfx::Rect old_bounds = bounds();
-    SetPosition(gfx::Point(event.x() - mouse_offset_.x(),
-                           event.y() - mouse_offset_.y()));
+    SetOrigin(gfx::Point(event.x() - mouse_offset_.x(),
+                         event.y() - mouse_offset_.y()));
     gfx::Rect new_bounds = bounds();
     parent()->InvalidateRect(old_bounds.Union(new_bounds));
     return true;
   }
   virtual void OnMouseReleased(const ui::MouseEvent& event) {
     set_color(old_color_);
   }
   virtual void OnMouseCaptureLost() {
     set_color(SK_ColorYELLOW);
   }
@@ skipping 13 matching lines @@
 class ContentsView : public ColorView {
  public:
   ContentsView()
       : c1_(new ColorView(SK_ColorBLUE)),
         c2_(new ColorView(SK_ColorGREEN)),
         c3_(new FancyPantsView()),
         ColorView(SK_ColorRED) {
     set_parent_owned(false);
     AddChildView(c1_);
     AddChildView(c2_);
-    c3_->SetPosition(gfx::Point(200, 200));
+    c3_->SetOrigin(gfx::Point(200, 200));
     AddChildView(c3_);
   }
 
   virtual ~ContentsView() {}
 
   void Init() {
     //c3_->SetHasLayer(true);
   }
 
  private:
   // Overridden from ui::View:
   virtual void Layout() {
-    c1_->SetBounds(20, 20, width() - 40, height() - 40);
-    c2_->SetBounds(50, 50, 50, 50);
+    c1_->SetBounds(gfx::Rect(20, 20, std::max(width() - 40, 0),
+                             std::max(height() - 40, 0)));
+    c2_->SetBounds(gfx::Rect(50, 50, 50, 50));
     c3_->SetSize(gfx::Size(75, 75));
     Invalidate();
   }
 
   View* c1_;
   View* c2_;
   FancyPantsView* c3_;
 };
 
 int main(int argc, char **argv) {
   OleInitialize(NULL);
   base::AtExitManager exit_manager;
   MessageLoop main_message_loop(MessageLoop::TYPE_UI);
 
   ContentsView cv;
   ui::Widget widget(&cv);
   widget.InitWithNativeViewParent(NULL, gfx::Rect(20, 20, 400, 400));
   cv.Init();
   widget.Show();
 
   V2DemoDispatcher dispatcher;
   MessageLoopForUI::current()->Run(&dispatcher);
 
   OleUninitialize();
 }