ash/shelf/shelf_widget.h - Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shelf/shelf_widget.h

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moved ash/test/material_design_controller_test_api.(h|cc) to ash/common/material_design/test/. Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ash/shelf/shelf_widget.h

diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h

index 8180c162acd11bb752eeca0e65c4d36bfbf31286..f624f32e8b685c330da17ff478523d401984e830 100644

--- a/ash/shelf/shelf_widget.h

+++ b/ash/shelf/shelf_widget.h

@@ -8,8 +8,9 @@

#include <memory>

#include "ash/ash_export.h"

+#include "ash/common/shelf/shelf_background_animator.h"

+#include "ash/common/shelf/shelf_background_animator_observer.h"

James Cook 2016/06/14 17:50:02 Do you need this include?

bruthig 2016/07/26 19:50:03 Removed.

#include "ash/common/shelf/shelf_types.h"

-#include "ash/common/wm/background_animator.h"

#include "ash/shelf/shelf_layout_manager_observer.h"

#include "base/macros.h"

#include "ui/views/widget/widget.h"

@@ -111,7 +112,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget,

// |delegate_view_| is the contents view of this widget and is cleaned up

// during CloseChildWindows of the associated RootWindowController.

DelegateView* delegate_view_;

- BackgroundAnimator background_animator_;

+ ShelfBackgroundAnimator background_animator_;

bool activating_as_fallback_;

DISALLOW_COPY_AND_ASSIGN(ShelfWidget);

« ash/common/wm/dock/docked_window_layout_manager.cc ('K') | « ash/shelf/shelf_layout_manager.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | ash/shelf/shelf_widget.cc » ('J')