Revert 271468 "Revert of [Refactor] Consolidate the logic for wh..."

trunk/src/ui/views/widget/widget.h

Index: trunk/src/ui/views/widget/widget.h
===================================================================
--- trunk/src/ui/views/widget/widget.h	(revision 271508)
+++ trunk/src/ui/views/widget/widget.h	(working copy)
@@ -162,6 +162,14 @@
       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
@@ -187,7 +195,7 @@
     // non-window widgets.
     WindowOpacity opacity;
     bool accept_events;
-    bool can_activate;
+    Activatable activatable;
     bool keep_on_top;
     bool visible_on_all_workspaces;
     Ownership ownership;
@@ -874,6 +882,9 @@
   // |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.