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

ui/views/widget/widget.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
 #define UI_VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
 #include <set>
 #include <stack>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/native_widget_delegate.h"
 #include "ui/views/window/client_view.h"
 #include "ui/views/window/non_client_view.h"
@@ skipping 132 matching lines @@
     WidgetDelegate* delegate;
     bool child;
     bool transient;
     // If true, the widget may be fully or partially transparent.  If false,
     // we can perform optimizations based on the widget being fully opaque.
     // For window widgets, defaults to ViewsDelegate::UseTransparentWindows().
     // Defaults to false for non-window widgets.
     bool transparent;
     bool accept_events;
     bool can_activate;
-    bool close_on_deactivate;
     bool keep_on_top;
     Ownership ownership;
     bool mirror_origin_in_rtl;
     bool has_dropshadow;
     // Only used by NativeWidgetWin. Specifies that the system default caption
     // and icon should not be rendered, and that the client area should be
     // equivalent to the window area.
     bool remove_standard_frame;
     // Whether the widget should be maximized or minimized.
     ui::WindowShowState show_state;
@@ skipping 510 matching lines @@
   // Returns the bounds and "show" state from the delegate. Returns true if
   // the delegate wants to use a specified bounds.
   bool GetSavedWindowPlacement(gfx::Rect* bounds,
                                ui::WindowShowState* show_state);
 
   // Sets a different InputMethod instance to this widget. The instance
   // must not be initialized, the ownership will be assumed by the widget.
   // It's only for testing purpose.
   void ReplaceInputMethod(InputMethod* input_method);
 
-  base::WeakPtrFactory<Widget> set_capture_factory_;
-
   internal::NativeWidgetPrivate* native_widget_;
 
   ObserverList<Observer> observers_;
 
   // Non-owned pointer to the Widget's delegate.  May be NULL if no delegate is
   // being used.
   WidgetDelegate* widget_delegate_;
 
   // The root of the View hierarchy attached to this window.
   // WARNING: see warning in tooltip_manager_ for ordering dependencies with
@@ skipping 45 matching lines @@
 
   // The restored bounds used for the initial show. This is only used if
   // |saved_show_state_| is maximized.
   gfx::Rect initial_restored_bounds_;
 
   // Focus is automatically set to the view provided by the delegate
   // when the widget is shown. Set this value to false to override
   // initial focus for the widget.
   bool focus_on_creation_;
 
-  // If true, the widget is closed when the user clicks outside the root view's
-  // bounds. This intentionally encompasses some situations where deactivation
-  // does not happen.
-  bool close_on_deactivate_;
-
   scoped_ptr<InputMethod> input_method_;
 
   // See |is_top_level()| accessor.
   bool is_top_level_;
 
   // Tracks whether native widget has been initialized.
   bool native_widget_initialized_;
 
   // Whether native widget has been destroyed.
   bool native_widget_destroyed_;
 
   // TODO(beng): Remove NativeWidgetGtk's dependence on these:
   // If true, the mouse is currently down.
   bool is_mouse_button_pressed_;
 
   // TODO(beng): Remove NativeWidgetGtk's dependence on these:
   // The following are used to detect duplicate mouse move events and not
   // deliver them. Displaying a window may result in the system generating
   // duplicate move events even though the mouse hasn't moved.
   bool last_mouse_event_was_move_;
   gfx::Point last_mouse_event_position_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_H_