Re-land:

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 "views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "views/focus/view_storage.h"
 #include "views/ime/input_method.h"
+#include "views/views_delegate.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/widget/root_view.h"
 #include "views/widget/native_widget.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, InitParams:
 
 Widget::InitParams::InitParams()
     : type(TYPE_WINDOW),
       child(false),
+      transient(false),
       transparent(false),
       accept_events(true),
       can_activate(true),
       keep_on_top(false),
       delete_on_destroy(true),
       mirror_origin_in_rtl(false),
       has_dropshadow(false),
       double_buffer(false),
       parent(NULL),
       parent_widget(NULL),
       native_widget(NULL) {
 }
 
 Widget::InitParams::InitParams(Type type)
     : type(type),
       child(type == TYPE_CONTROL),
+      transient(type == TYPE_POPUP || type == TYPE_MENU),
       transparent(false),
       accept_events(true),
       can_activate(type != TYPE_POPUP && type != TYPE_MENU),
       keep_on_top(type == TYPE_MENU),
       delete_on_destroy(true),
       mirror_origin_in_rtl(false),
       has_dropshadow(false),
       double_buffer(false),
       parent(NULL),
       parent_widget(NULL),
       native_widget(NULL) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 // static
 Widget::InitParams Widget::WindowInitParams() {
   return InitParams(InitParams::TYPE_WINDOW);
 }
 
 Widget::Widget()
     : is_mouse_button_pressed_(false),
       last_mouse_event_was_move_(false),
       native_widget_(NULL),
       widget_delegate_(NULL),
-      dragged_view_(NULL) {
+      dragged_view_(NULL),
+      delete_on_destroy_(false),
+      is_secondary_widget_(true) {
 }
 
 Widget::~Widget() {
+  DestroyRootView();
+
+  if (!delete_on_destroy_)
+    delete native_widget_;
 }
 
 void Widget::Init(const InitParams& params) {
+  delete_on_destroy_ = params.delete_on_destroy;
+  native_widget_ =
+      params.native_widget ? params.native_widget
+                           : NativeWidget::CreateNativeWidget(this);
   GetRootView();
   default_theme_provider_.reset(new DefaultThemeProvider);
+  if (params.type == InitParams::TYPE_MENU)
+    is_mouse_button_pressed_ = native_widget_->IsMouseButtonDown();
   native_widget_->InitNativeWidget(params);
 }
 
 // Unconverted methods (see header) --------------------------------------------
 
 gfx::NativeView Widget::GetNativeView() const {
-  return NULL;
+   return native_widget_->GetNativeView();
 }
 
 gfx::NativeWindow Widget::GetNativeWindow() const {
-  return NULL;
-}
-
-void Widget::GenerateMousePressedForView(View* view, const gfx::Point& point) {
+  return native_widget_->GetNativeWindow();
 }
 
 bool Widget::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) {
   return false;
 }
 
-Window* Widget::GetWindow() {
-  return NULL;
+Window* Widget::GetContainingWindow() {
+  return native_widget_->GetContainingWindow();
 }
 
-const Window* Widget::GetWindow() const {
-  return NULL;
+const Window* Widget::GetContainingWindow() const {
+  return native_widget_->GetContainingWindow();
 }
 
 void Widget::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
   if (!is_add) {
     if (child == dragged_view_)
       dragged_view_ = NULL;
 
     FocusManager* focus_manager = GetFocusManager();
     if (focus_manager)
       focus_manager->ViewRemoved(child);
-    ViewStorage::GetInstance()->ViewRemoved(parent, child);
+    ViewStorage::GetInstance()->ViewRemoved(child);
+    native_widget_->ViewRemoved(child);
   }
 }
 
 void Widget::NotifyNativeViewHierarchyChanged(bool attached,
                                               gfx::NativeView native_view) {
   if (!attached) {
     FocusManager* focus_manager = GetFocusManager();
     // We are being removed from a window hierarchy.  Treat this as
     // the root_view_ being removed.
     if (focus_manager)
@@ skipping 144 matching lines @@
 }
 
 void Widget::SchedulePaintInRect(const gfx::Rect& rect) {
   native_widget_->SchedulePaintInRect(rect);
 }
 
 void Widget::SetCursor(gfx::NativeCursor cursor) {
   native_widget_->SetCursor(cursor);
 }
 
+void Widget::ResetLastMouseMoveFlag() {
+  last_mouse_event_was_move_ = false;
+}
+
 FocusTraversable* Widget::GetFocusTraversable() {
   return root_view_.get();
 }
 
 void Widget::ThemeChanged() {
   root_view_->ThemeChanged();
 }
 
 void Widget::LocaleChanged() {
   root_view_->LocaleChanged();
 }
 
 void Widget::SetFocusTraversableParent(FocusTraversable* parent) {
   root_view_->SetFocusTraversableParent(parent);
 }
 
 void Widget::SetFocusTraversableParentView(View* parent_view) {
   root_view_->SetFocusTraversableParentView(parent_view);
 }
 
+void Widget::NotifyAccessibilityEvent(
+    View* view,
+    ui::AccessibilityTypes::Event event_type,
+    bool send_native_event) {
+  // Send the notification to the delegate.
+  if (ViewsDelegate::views_delegate)
+    ViewsDelegate::views_delegate->NotifyAccessibilityEvent(view, event_type);
+
+  if (send_native_event)
+    native_widget_->SendNativeAccessibilityEvent(view, event_type);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, NativeWidgetDelegate implementation:
 
 void Widget::OnNativeFocus(gfx::NativeView focused_view) {
   GetFocusManager()->GetWidgetFocusManager()->OnWidgetFocusEvent(
       focused_view,
       GetNativeView());
 }
 
 void Widget::OnNativeBlur(gfx::NativeView focused_view) {
@@ skipping 94 matching lines @@
   }
   return true;
 }
 
 void Widget::OnMouseCaptureLost() {
   if (is_mouse_button_pressed_)
     GetRootView()->OnMouseCaptureLost();
   is_mouse_button_pressed_ = false;
 }
 
+Widget* Widget::AsWidget() {
+  return this;
+}
+
+const Widget* Widget::AsWidget() const {
+  return this;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, FocusTraversable implementation:
 
 FocusSearch* Widget::GetFocusSearch() {
   return root_view_->GetFocusSearch();
 }
 
 FocusTraversable* Widget::GetFocusTraversableParent() {
   // We are a proxy to the root view, so we should be bypassed when traversing
   // up and as a result this should not be called.
@@ skipping 45 matching lines @@
   gfx::AcceleratedWidget widget = native_widget_->GetAcceleratedWidget();
   if (widget != gfx::kNullAcceleratedWidget)
     compositor_ = ui::Compositor::Create(widget);
 }
 
 bool Widget::ShouldReleaseCaptureOnMouseReleased() const {
   return true;
 }
 
 }  // namespace views