Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1036)

Unified Diff: chrome/browser/ui/search/toolbar_search_animator.h

Issue 10873094: alternate ntp: fix toolbar separator visibility when query is cleared (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « chrome/browser/ui/search/search_delegate.cc ('k') | chrome/browser/ui/search/toolbar_search_animator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search/toolbar_search_animator.h
diff --git a/chrome/browser/ui/search/toolbar_search_animator.h b/chrome/browser/ui/search/toolbar_search_animator.h
index efd4d5f16e9b77957ad8ea1cf2a22bae8c3e2869..4ac90818590132b730dedeb843d5e914de36809f 100644
--- a/chrome/browser/ui/search/toolbar_search_animator.h
+++ b/chrome/browser/ui/search/toolbar_search_animator.h
@@ -12,6 +12,7 @@
#include "ui/base/animation/animation_delegate.h"
class TabContents;
+class ToolbarModel;
namespace ui {
class MultiAnimation;
@@ -30,7 +31,7 @@ class ToolbarSearchAnimatorObserver;
class ToolbarSearchAnimator : public SearchModelObserver,
public ui::AnimationDelegate {
public:
- explicit ToolbarSearchAnimator(SearchModel* search_model);
+ ToolbarSearchAnimator(SearchModel* search_model, ToolbarModel* toolbar_model);
virtual ~ToolbarSearchAnimator();
// Get the gradient background opacity to paint for toolbar and active tab, a
@@ -87,6 +88,9 @@ class ToolbarSearchAnimator : public SearchModelObserver,
// Weak. Owned by Browser. Non-NULL.
SearchModel* search_model_;
+ // Weak. Owned by Browser. Non-NULL.
+ ToolbarModel* toolbar_model_;
+
// The background change animation.
scoped_ptr<ui::MultiAnimation> background_animation_;
« no previous file with comments | « chrome/browser/ui/search/search_delegate.cc ('k') | chrome/browser/ui/search/toolbar_search_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698