Hook up the FocusController behind a flag.

ui/views/controls/menu/menu_controller_aura.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_controller.h"
 
 #include "base/run_loop.h"
-#include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/dispatcher_client.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/corewm/activation_change_shim.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 namespace {
 
 // ActivationChangeObserverImpl is used to observe activation changes and close
 // the menu. Additionally it listens for the root window to be destroyed and
 // cancel the menu as well.
 class ActivationChangeObserverImpl
-    : public aura::client::ActivationChangeObserver,
+    : public corewm::ActivationChangeShim,
       public aura::WindowObserver {
  public:
   ActivationChangeObserverImpl(MenuController* controller,
                                aura::RootWindow* root)
-      : controller_(controller),
+      : ActivationChangeShim(root),
+        controller_(controller),
         root_(root) {
     aura::client::GetActivationClient(root_)->AddObserver(this);
     root_->AddObserver(this);
   }
 
   virtual ~ActivationChangeObserverImpl() {
     Cleanup();
   }
 
   // aura::client::ActivationChangeObserver overrides:
@@ skipping 57 matching lines @@
 }
 
 gfx::Screen* MenuController::GetScreen() {
   aura::RootWindow* root = GetOwnerRootWindow(owner_);
   return root ?
       gfx::Screen::GetScreenFor(root) : gfx::Screen::GetNativeScreen();
 }
 
 
 }  // namespace views