| Index: ash/wm/workspace/workspace_manager.cc
|
| diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc
|
| index bfabf15f88e0db4710a2e850812f1b108db3c4ec..96531deaf9c548439841c885e67c8acc4a92c266 100644
|
| --- a/ash/wm/workspace/workspace_manager.cc
|
| +++ b/ash/wm/workspace/workspace_manager.cc
|
| @@ -113,8 +113,7 @@ WorkspaceManager::WorkspaceManager(Window* contents_window)
|
| active_workspace_(NULL),
|
| shelf_(NULL),
|
| in_move_(false),
|
| - ALLOW_THIS_IN_INITIALIZER_LIST(
|
| - clear_unminimizing_workspace_factory_(this)),
|
| + clear_unminimizing_workspace_factory_(this),
|
| unminimizing_workspace_(NULL),
|
| app_terminating_(false),
|
| creating_fade_(false),
|
|
|