View API/implementation cleanup:...

ui/views/widget/widget.cc

Index: ui/views/widget/widget.cc
===================================================================
--- ui/views/widget/widget.cc	(revision 75141)
+++ ui/views/widget/widget.cc	(working copy)
@@ -161,7 +161,7 @@
 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())
@@ -169,7 +169,7 @@
         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
@@ -181,13 +181,13 @@
       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.
@@ -198,7 +198,7 @@
         root_view_->OnMouseMoved(event);
       }
       break;
-    case ui::ET_MOUSE_EXITED:
+    case ui::Event::ET_MOUSE_EXITED:
       root_view_->OnMouseExited(event);
       return true;
   }