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

Unified Diff: chrome/browser/ui/search/search_delegate.cc

Issue 10662032: alternate ntp (cros/partial-win): add tab-related stuff and toolbar/tab background change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed scott's comments Created 8 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
« no previous file with comments | « chrome/browser/ui/search/search_delegate.h ('k') | chrome/browser/ui/search/toolbar_search_animator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search/search_delegate.cc
diff --git a/chrome/browser/ui/search/search_delegate.cc b/chrome/browser/ui/search/search_delegate.cc
index 9af5648e24f2935c65407b44aef070c7b988c5e4..e0839f67bdf56420007de751d8e014b59ec88e34 100644
--- a/chrome/browser/ui/search/search_delegate.cc
+++ b/chrome/browser/ui/search/search_delegate.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/ui/search/search_model.h"
#include "chrome/browser/ui/search/search_tab_helper.h"
+#include "chrome/browser/ui/search/toolbar_search_animator.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
namespace chrome {
@@ -13,7 +14,8 @@ namespace search {
SearchDelegate::SearchDelegate(SearchModel* browser_model)
: browser_model_(browser_model),
- tab_model_(NULL) {
+ tab_model_(NULL),
+ toolbar_search_animator_(browser_model) {
}
SearchDelegate::~SearchDelegate() {
@@ -48,6 +50,7 @@ void SearchDelegate::StopObserveringTab(
tab_model_->RemoveObserver(this);
browser_model_->set_tab_contents(NULL);
tab_model_ = NULL;
+ toolbar_search_animator_.FinishAnimation(contents);
}
}
« no previous file with comments | « chrome/browser/ui/search/search_delegate.h ('k') | chrome/browser/ui/search/toolbar_search_animator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698