| Index: ui/aura_shell/shell.cc
 | 
| ===================================================================
 | 
| --- ui/aura_shell/shell.cc	(revision 114022)
 | 
| +++ ui/aura_shell/shell.cc	(working copy)
 | 
| @@ -13,6 +13,7 @@
 | 
|  #include "ui/aura/layout_manager.h"
 | 
|  #include "ui/aura/window.h"
 | 
|  #include "ui/aura/window_types.h"
 | 
| +#include "ui/aura_shell/activation_controller.h"
 | 
|  #include "ui/aura_shell/app_list.h"
 | 
|  #include "ui/aura_shell/default_container_event_filter.h"
 | 
|  #include "ui/aura_shell/default_container_layout_manager.h"
 | 
| @@ -178,6 +179,8 @@
 | 
|    aura::RootWindow* root_window = aura::RootWindow::GetInstance();
 | 
|    root_window->SetCursor(aura::kCursorPointer);
 | 
|  
 | 
| +  activation_controller_.reset(new internal::ActivationController);
 | 
| +
 | 
|    aura::Window::Windows containers;
 | 
|    CreateSpecialContainers(&containers);
 | 
|    aura::Window::Windows::const_iterator i;
 | 
| 
 |