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

trunk/src/ui/views/widget/widget_interactive_uitest.cc

 // Copyright (c) 2013 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 718 matching lines @@
 }
 
 #endif
 
 TEST_F(WidgetTestInteractive, CanActivateFlagIsHonored) {
   Widget widget;
   Widget::InitParams init_params =
       CreateParams(Widget::InitParams::TYPE_WINDOW);
   init_params.bounds = gfx::Rect(0, 0, 200, 200);
   init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  init_params.can_activate = false;
+  init_params.activatable = Widget::InitParams::ACTIVATABLE_NO;
 #if !defined(OS_CHROMEOS)
   init_params.native_widget = new DesktopNativeWidgetAura(&widget);
 #endif  // !defined(OS_CHROMEOS)
   widget.Init(init_params);
 
   widget.Show();
   EXPECT_FALSE(widget.IsActive());
 }
 
 // Test that touch selection quick menu is not activated when opened.
@@ skipping 215 matching lines @@
   ui::EventDispatchDetails details = widget1.GetNativeWindow()->
       GetHost()->event_processor()->OnEventFromSource(&mouse_event);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_TRUE(widget1.GetAndClearGotMouseEvent());
   EXPECT_FALSE(widget2.GetAndClearGotMouseEvent());
 }
 #endif
 
 }  // namespace test
 }  // namespace views