| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index fa16158d70052dd584779ec4b1dde0a7ec086758..f84ca5659799c2d50ac33a3df628fea1396ac5ba 100644
|
| --- a/ash/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -164,6 +164,8 @@ class ASH_EXPORT ShelfLayoutManager :
|
| // Overriden from aura::client::ActivationChangeObserver:
|
| virtual void OnWindowActivated(aura::Window* gained_active,
|
| aura::Window* lost_active) OVERRIDE;
|
| + virtual void OnWindowActivationRequestCompleted(
|
| + aura::Window* request_active, aura::Window* actual_active) OVERRIDE;
|
|
|
| // TODO(harrym|oshima): These templates will be moved to
|
| // new Shelf class.
|
|
|