Index: chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc |
=================================================================== |
--- chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc (revision 170746) |
+++ chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc (working copy) |
@@ -184,7 +184,9 @@ |
ShellWindowLauncherController::ShellWindowLauncherController( |
ChromeLauncherController* owner) |
- : owner_(owner), |
+ : ActivationChangeShim(ash::Shell::HasInstance() ? |
+ ash::Shell::GetInstance() : NULL), |
+ owner_(owner), |
registry_(extensions::ShellWindowRegistry::Get(owner->profile())), |
activation_client_(NULL) { |
registry_->AddObserver(this); |