Revert: [Refactor] Consolidate the logic for whether a widget can be activated. This is a first ste

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_
 
 #include <set>
 #include <stack>
 #include <vector>
@@ skipping 144 matching lines @@
       // Infer fully opaque or not. For WinAura, top-level windows that are not
       // of TYPE_WINDOW are translucent so that they can be made to fade in. In
       // all other cases, windows are fully opaque.
       INFER_OPACITY,
       // Fully opaque.
       OPAQUE_WINDOW,
       // Possibly translucent/transparent.
       TRANSLUCENT_WINDOW,
     };
 
-    enum Activatable {
-      // Infer whether the window should be activatable from the window type.
-      ACTIVATABLE_DEFAULT,
-
-      ACTIVATABLE_YES,
-      ACTIVATABLE_NO
-    };
-
     enum Ownership {
       // Default. Creator is not responsible for managing the lifetime of the
       // Widget, it is destroyed when the corresponding NativeWidget is
       // destroyed.
       NATIVE_WIDGET_OWNS_WIDGET,
       // Used when the Widget is owned by someone other than the NativeWidget,
       // e.g. a scoped_ptr in tests.
       WIDGET_OWNS_NATIVE_WIDGET
     };
 
     InitParams();
     explicit InitParams(Type type);
     ~InitParams();
 
     Type type;
     // If NULL, a default implementation will be constructed.
     WidgetDelegate* delegate;
     bool child;
     // If TRANSLUCENT_WINDOW, the widget may be fully or partially transparent.
     // If OPAQUE_WINDOW, we can perform optimizations based on the widget being
     // fully opaque.  Defaults to TRANSLUCENT_WINDOW if
     // ViewsDelegate::UseTransparentWindows().  Defaults to OPAQUE_WINDOW for
     // non-window widgets.
     WindowOpacity opacity;
     bool accept_events;
-    Activatable activatable;
+    bool can_activate;
     bool keep_on_top;
     bool visible_on_all_workspaces;
     Ownership ownership;
     bool mirror_origin_in_rtl;
     bool has_dropshadow;
     // Specifies that the system default caption and icon should not be
     // rendered, and that the client area should be equivalent to the window
     // area. Only used on some platforms (Windows and Linux).
     bool remove_standard_frame;
     // Only used by ShellWindow on Windows. Specifies that the default icon of
@@ skipping 666 matching lines @@
   bool widget_closed_;
 
   // The saved "show" state for this window. See note in SetInitialBounds
   // that explains why we save this.
   ui::WindowShowState saved_show_state_;
 
   // The restored bounds used for the initial show. This is only used if
   // |saved_show_state_| is maximized.
   gfx::Rect initial_restored_bounds_;
 
-  // True if the widget can be activated.
-  bool can_activate_;
-
   // 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_;
 
   mutable scoped_ptr<InputMethod> input_method_;
 
   // See |is_top_level()| accessor.
   bool is_top_level_;
 
@@ skipping 32 matching lines @@
   bool movement_disabled_;
 
   ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_H_