| Index: ash/wm/activation_controller.cc
|
| diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc
|
| index 196043ac81992b1804222343d6ebece911ab82a6..8c48346b5eb313e3b87f80cd7956829740eb952e 100644
|
| --- a/ash/wm/activation_controller.cc
|
| +++ b/ash/wm/activation_controller.cc
|
| @@ -149,7 +149,7 @@ ActivationController::ActivationController(
|
| : focus_client_(focus_client),
|
| updating_activation_(false),
|
| active_window_(NULL),
|
| - ALLOW_THIS_IN_INITIALIZER_LIST(observer_manager_(this)),
|
| + observer_manager_(this),
|
| delegate_(delegate) {
|
| aura::Env::GetInstance()->AddObserver(this);
|
| focus_client_->AddObserver(this);
|
|
|