Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Unified Diff: ui/views/widget/widget.h

Issue 10383236: Revert 137059 - Better fix for closing uber tray when clicking on Desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/bubble/bubble_delegate.cc ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.h
===================================================================
--- ui/views/widget/widget.h (revision 137750)
+++ ui/views/widget/widget.h (working copy)
@@ -11,7 +11,6 @@
#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"
@@ -164,7 +163,6 @@
bool transparent;
bool accept_events;
bool can_activate;
- bool close_on_deactivate;
bool keep_on_top;
Ownership ownership;
bool mirror_origin_in_rtl;
@@ -695,8 +693,6 @@
// It's only for testing purpose.
void ReplaceInputMethod(InputMethod* input_method);
- base::WeakPtrFactory<Widget> set_capture_factory_;
-
internal::NativeWidgetPrivate* native_widget_;
ObserverList<Observer> observers_;
@@ -762,11 +758,6 @@
// 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.
« no previous file with comments | « ui/views/bubble/bubble_delegate.cc ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698