Revert 137059 - Better fix for closing uber tray when clicking on Desktop

ui/views/widget/widget.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_font_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/focus/focus_manager.h"
@@ skipping 83 matching lines @@
 
 Widget::InitParams::InitParams()
     : type(TYPE_WINDOW),
       delegate(NULL),
       child(false),
       transient(false),
       transparent(ViewsDelegate::views_delegate &&
                   ViewsDelegate::views_delegate->UseTransparentWindows()),
       accept_events(true),
       can_activate(true),
-      close_on_deactivate(false),
       keep_on_top(false),
       ownership(NATIVE_WIDGET_OWNS_WIDGET),
       mirror_origin_in_rtl(false),
       has_dropshadow(false),
       remove_standard_frame(false),
       show_state(ui::SHOW_STATE_DEFAULT),
       double_buffer(false),
       parent(NULL),
       parent_widget(NULL),
       native_widget(NULL),
       top_level(false),
       layer_type(ui::LAYER_TEXTURED) {
 }
 
 Widget::InitParams::InitParams(Type type)
     : type(type),
       delegate(NULL),
       child(type == TYPE_CONTROL),
       transient(type == TYPE_BUBBLE || type == TYPE_POPUP || type == TYPE_MENU),
       transparent(type == TYPE_WINDOW &&
                   ViewsDelegate::views_delegate &&
                   ViewsDelegate::views_delegate->UseTransparentWindows()),
       accept_events(true),
       can_activate(type != TYPE_POPUP && type != TYPE_MENU),
-      close_on_deactivate(false),
       keep_on_top(type == TYPE_MENU),
       ownership(NATIVE_WIDGET_OWNS_WIDGET),
       mirror_origin_in_rtl(false),
       has_dropshadow(false),
       remove_standard_frame(false),
       show_state(ui::SHOW_STATE_DEFAULT),
       double_buffer(false),
       parent(NULL),
       parent_widget(NULL),
       native_widget(NULL),
       top_level(false),
       layer_type(ui::LAYER_TEXTURED) {
 }
 
 gfx::NativeView Widget::InitParams::GetParent() const {
   return parent_widget ? parent_widget->GetNativeView() : parent;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 Widget::Widget()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(set_capture_factory_(this)),
-      native_widget_(NULL),
+    : native_widget_(NULL),
       widget_delegate_(NULL),
       non_client_view_(NULL),
       dragged_view_(NULL),
       event_stack_(),
       ownership_(InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       is_secondary_widget_(true),
       frame_type_(FRAME_TYPE_DEFAULT),
       disable_inactive_rendering_(false),
       widget_closed_(false),
       saved_show_state_(ui::SHOW_STATE_DEFAULT),
       focus_on_creation_(true),
-      close_on_deactivate_(false),
       is_top_level_(false),
       native_widget_initialized_(false),
       native_widget_destroyed_(false),
       is_mouse_button_pressed_(false),
       last_mouse_event_was_move_(false) {
 }
 
 Widget::~Widget() {
   while (!event_stack_.empty()) {
     event_stack_.top()->reset();
@@ skipping 131 matching lines @@
     SetInitialBounds(params.bounds);
     if (params.show_state == ui::SHOW_STATE_MAXIMIZED)
       Maximize();
     else if (params.show_state == ui::SHOW_STATE_MINIMIZED)
       Minimize();
     UpdateWindowTitle();
   } else if (params.delegate) {
     SetContentsView(params.delegate->GetContentsView());
     SetInitialBoundsForFramelessWindow(params.bounds);
   }
-  close_on_deactivate_ = params.close_on_deactivate;
   native_widget_initialized_ = true;
 }
 
 // Unconverted methods (see header) --------------------------------------------
 
 gfx::NativeView Widget::GetNativeView() const {
   return native_widget_->GetNativeView();
 }
 
 gfx::NativeWindow Widget::GetNativeWindow() const {
@@ skipping 175 matching lines @@
     } else {
       native_widget_->ShowWithWindowState(saved_show_state_);
     }
     // |saved_show_state_| only applies the first time the window is shown.
     // If we don't reset the value the window may be shown maximized every time
     // it is subsequently shown after being hidden.
     saved_show_state_ = ui::SHOW_STATE_NORMAL;
   } else {
     native_widget_->Show();
   }
-
-  if (CanActivate() && close_on_deactivate_) {
-    // Set mouse capture on timeout in case this is called from a
-    // mouse pressed handler.
-    MessageLoopForUI::current()->PostTask(FROM_HERE, base::Bind(
-           &Widget::SetMouseCapture, set_capture_factory_.GetWeakPtr(),
-           static_cast<View*>(NULL)));
-  }
 }
 
 void Widget::Hide() {
   native_widget_->Hide();
 }
 
 void Widget::ShowInactive() {
   // If this gets called with saved_show_state_ == ui::SHOW_STATE_MAXIMIZED,
   // call SetBounds()with the restored bounds to set the correct size. This
   // normally should not happen, but if it does we should avoid showing unsized
@@ skipping 519 matching lines @@
     case ui::ET_MOUSE_PRESSED:
       last_mouse_event_was_move_ = false;
       // Make sure we're still visible before we attempt capture as the mouse
       // press processing may have made the window hide (as happens with menus).
       if (GetRootView()->OnMousePressed(event) && IsVisible()) {
         is_mouse_button_pressed_ = true;
         if (!native_widget_->HasCapture())
           native_widget_->SetCapture();
         return true;
       }
-      if (close_on_deactivate_ && !GetRootView()->HitTest(event.location()))
-        Close();
       return false;
     case ui::ET_MOUSE_RELEASED:
       last_mouse_event_was_move_ = false;
       is_mouse_button_pressed_ = false;
       // Release capture first, to avoid confusion if OnMouseReleased blocks.
       if (native_widget_->HasCapture() &&
           ShouldReleaseCaptureOnMouseReleased()) {
         native_widget_->ReleaseCapture();
       }
       GetRootView()->OnMouseReleased(event);
@@ skipping 20 matching lines @@
     default:
       return false;
   }
   return true;
 }
 
 void Widget::OnMouseCaptureLost() {
   if (is_mouse_button_pressed_)
     GetRootView()->OnMouseCaptureLost();
   is_mouse_button_pressed_ = false;
-
-  // Without mouse capture, the widget doesn't process all events so can miss
-  // the user clicking outside the root view's bounds.
-  if (close_on_deactivate_)
-    Close();
 }
 
 ui::TouchStatus Widget::OnTouchEvent(const TouchEvent& event) {
   ScopedEvent scoped(this, event);
   return GetRootView()->OnTouchEvent(event);
 }
 
 ui::GestureStatus Widget::OnGestureEvent(const GestureEvent& event) {
   ScopedEvent scoped(this, event);
   return GetRootView()->OnGestureEvent(event);
@@ skipping 47 matching lines @@
   non_client_view_ = NULL;
   root_view_.reset();
   // Input method has to be destroyed before focus manager.
   input_method_.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, private:
 
 bool Widget::ShouldReleaseCaptureOnMouseReleased() const {
-  return !close_on_deactivate_;
+  return true;
 }
 
 void Widget::SetInactiveRenderingDisabled(bool value) {
   disable_inactive_rendering_ = value;
   // We need to always notify the NonClientView so that it can trigger a paint.
   // TODO: what's really needed is a way to know when either the active state
   // changes or |disable_inactive_rendering_| changes.
   if (non_client_view_)
     non_client_view_->SetInactiveRenderingDisabled(value);
   native_widget_->SetInactiveRenderingDisabled(value);
@@ skipping 90 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views