View API/implementation cleanup:...

ui/views/widget/widget.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 "ui/views/widget/widget.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
@@ skipping 143 matching lines @@
   if (native_widget_->HasMouseCapture()) {
     if (is_mouse_button_pressed_)
       root_view_->OnMouseCaptureLost();
     is_mouse_button_pressed_ = false;
   }
 }
 
 bool Widget::OnMouseEvent(const MouseEvent& event) {
   last_mouse_event_was_move_ = false;
   switch (event.type()) {
-    case ui::ET_MOUSE_PRESSED:
+    case ui::Event::ET_MOUSE_PRESSED:
       if (root_view_->OnMousePressed(event)) {
         is_mouse_button_pressed_ = true;
         if (!native_widget_->HasMouseCapture())
           native_widget_->SetMouseCapture();
         return true;
       }
       return false;
-    case ui::ET_MOUSE_RELEASED:
+    case ui::Event::ET_MOUSE_RELEASED:
       // TODO(beng): NativeWidgetGtk should not call this function if drag data
       //             exists, see comment in this function in WidgetGtk.
       // Release the capture first, that way we don't get confused if
       // OnMouseReleased blocks.
       if (native_widget_->HasMouseCapture() &&
           native_widget_->ShouldReleaseCaptureOnMouseReleased()) {
         native_widget_->ReleaseMouseCapture();
       }
       is_mouse_button_pressed_ = false;
       root_view_->OnMouseReleased(event);
       return true;
-    case ui::ET_MOUSE_MOVED:
+    case ui::Event::ET_MOUSE_MOVED:
       if (native_widget_->HasMouseCapture() && is_mouse_button_pressed_) {
         last_mouse_event_was_move_ = false;
         root_view_->OnMouseDragged(event);
       } else {
         gfx::Point screen_loc(event.location());
-        View::ConvertPointToScreen(root_view_.get(), &screen_loc);
+        View::ConvertPointToScreen(*root_view_, &screen_loc);
         if (last_mouse_event_was_move_ &&
             last_mouse_event_position_ == screen_loc) {
           // Don't generate a mouse event for the same location as the last.
           return true;
         }
         last_mouse_event_position_ = screen_loc;
         last_mouse_event_was_move_ = true;
         root_view_->OnMouseMoved(event);
       }
       break;
-    case ui::ET_MOUSE_EXITED:
+    case ui::Event::ET_MOUSE_EXITED:
       root_view_->OnMouseExited(event);
       return true;
   }
   return true;
 }
 
 bool Widget::OnMouseWheelEvent(const MouseWheelEvent& event) {
   return root_view_->OnMouseWheel(event);
 }
 
@@ skipping 30 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, private:
 
 void Widget::CloseNow() {
   native_widget_->Close();
 }
 
 }  // namespace ui