OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/search/search_delegate.h" | 5 #include "chrome/browser/ui/search/search_delegate.h" |
6 | 6 |
7 #include "chrome/browser/ui/search/search_model.h" | 7 #include "chrome/browser/ui/search/search_model.h" |
8 #include "chrome/browser/ui/search/search_tab_helper.h" | 8 #include "chrome/browser/ui/search/search_tab_helper.h" |
9 #include "chrome/browser/ui/search/toolbar_search_animator.h" | 9 #include "chrome/browser/ui/search/toolbar_search_animator.h" |
10 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 10 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
11 | 11 |
12 namespace chrome { | 12 namespace chrome { |
13 namespace search { | 13 namespace search { |
14 | 14 |
15 SearchDelegate::SearchDelegate(SearchModel* browser_model) | 15 SearchDelegate::SearchDelegate(SearchModel* browser_search_model, |
16 : browser_model_(browser_model), | 16 ToolbarModel* toolbar_model) |
| 17 : browser_model_(browser_search_model), |
17 tab_model_(NULL), | 18 tab_model_(NULL), |
18 toolbar_search_animator_(browser_model) { | 19 toolbar_search_animator_(browser_search_model, toolbar_model) { |
19 } | 20 } |
20 | 21 |
21 SearchDelegate::~SearchDelegate() { | 22 SearchDelegate::~SearchDelegate() { |
22 DCHECK(!tab_model_) << "All tabs should have been deactivated or closed."; | 23 DCHECK(!tab_model_) << "All tabs should have been deactivated or closed."; |
23 } | 24 } |
24 | 25 |
25 void SearchDelegate::ModeChanged(const Mode& old_mode, const Mode& new_mode) { | 26 void SearchDelegate::ModeChanged(const Mode& old_mode, const Mode& new_mode) { |
26 browser_model_->SetMode(new_mode); | 27 browser_model_->SetMode(new_mode); |
27 } | 28 } |
28 | 29 |
(...skipping 20 matching lines...) Expand all Loading... |
49 if (contents->search_tab_helper()->model() == tab_model_) { | 50 if (contents->search_tab_helper()->model() == tab_model_) { |
50 tab_model_->RemoveObserver(this); | 51 tab_model_->RemoveObserver(this); |
51 browser_model_->set_tab_contents(NULL); | 52 browser_model_->set_tab_contents(NULL); |
52 tab_model_ = NULL; | 53 tab_model_ = NULL; |
53 toolbar_search_animator_.FinishAnimation(contents); | 54 toolbar_search_animator_.FinishAnimation(contents); |
54 } | 55 } |
55 } | 56 } |
56 | 57 |
57 } // namespace search | 58 } // namespace search |
58 } // namespace chrome | 59 } // namespace chrome |
OLD | NEW |