chrome/browser/ui/search/search_delegate.cc - Issue 10662032: alternate ntp (cros/partial-win): add tab-related stuff and toolbar/tab background change

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: 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: removed images from cl 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') | chrome/browser/ui/search/toolbar_search_animator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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);

}