| Index: ash/wm/dock/docked_window_layout_manager.cc
|
| diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc
|
| index 14ccaa37329ea6a35b616c08f37d6c41097d51dd..552ba75f3f337d3d13db1c483d43914663c6b938 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager.cc
|
| +++ b/ash/wm/dock/docked_window_layout_manager.cc
|
| @@ -87,12 +87,12 @@ class DockedBackgroundWidget : public views::Widget,
|
| }
|
|
|
| // views::Widget:
|
| - virtual void OnNativeWidgetVisibilityChanged(bool visible) OVERRIDE {
|
| + virtual void OnNativeWidgetVisibilityChanged(bool visible) override {
|
| views::Widget::OnNativeWidgetVisibilityChanged(visible);
|
| UpdateBackground();
|
| }
|
|
|
| - virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE {
|
| + virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) override {
|
| const gfx::ImageSkia& shelf_background(
|
| alignment_ == DOCKED_ALIGNMENT_LEFT ?
|
| shelf_background_left_ : shelf_background_right_);
|
| @@ -127,7 +127,7 @@ class DockedBackgroundWidget : public views::Widget,
|
| }
|
|
|
| // BackgroundAnimatorDelegate:
|
| - virtual void UpdateBackground(int alpha) OVERRIDE {
|
| + virtual void UpdateBackground(int alpha) override {
|
| alpha_ = alpha;
|
| SchedulePaintInRect(gfx::Rect(GetWindowBoundsInScreen().size()));
|
| }
|
| @@ -382,7 +382,7 @@ class DockedWindowLayoutManager::ShelfWindowObserver : public WindowObserver {
|
| // aura::WindowObserver:
|
| virtual void OnWindowBoundsChanged(aura::Window* window,
|
| const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) OVERRIDE {
|
| + const gfx::Rect& new_bounds) override {
|
| shelf_bounds_in_screen_ = ScreenUtil::ConvertRectToScreen(
|
| window->parent(), new_bounds);
|
| docked_layout_manager_->OnShelfBoundsChanged();
|
|
|