More unittests passing with new focus controller.

ash/shell.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 ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 318 matching lines @@
     return high_contrast_controller_.get();
   }
 
   MagnificationController* magnification_controller() {
     return magnification_controller_.get();
   }
 
   PartialMagnificationController* partial_magnification_controller() {
     return partial_magnification_controller_.get();
   }
+  aura::client::ActivationClient* activation_client() {
+    return activation_client_;
+  }
 
   ScreenAsh* screen() { return screen_; }
 
   // Force the shelf to query for it's current visibility state.
   void UpdateShelfVisibility();
 
   // TODO(oshima): Define an interface to access shelf/launcher
   // state, or just use Launcher.
 
   // Sets/gets the shelf auto-hide behavior on |root_window|.
@@ skipping 47 matching lines @@
   // Made available for tests.
   views::corewm::ShadowController* shadow_controller() {
     return shadow_controller_.get();
   }
 
   content::BrowserContext* browser_context() { return browser_context_; }
   void set_browser_context(content::BrowserContext* browser_context) {
     browser_context_ = browser_context;
   }
 
-  aura::client::ActivationClient* activation_client() {
-    return activation_client_;
-  }
-
   // Initializes the root window to be used for a secondary display.
   void InitRootWindowForSecondaryDisplay(aura::RootWindow* root);
 
   // Starts the animation that occurs on first login.
   void DoInitialWorkspaceAnimation();
 
 #if defined(OS_CHROMEOS)
   chromeos::OutputConfigurator* output_configurator() {
     return output_configurator_.get();
   }
@@ skipping 152 matching lines @@
 
   // For testing only: simulate that a modal window is open
   bool simulate_modal_window_open_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_