| 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 #ifndef CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "chrome/browser/ui/search/search_model_observer.h" | 10 #include "chrome/browser/ui/search/search_model_observer.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 // Sets the active tab. | 52 // Sets the active tab. |
| 53 void SetTabContents(TabContents* tab_contents); | 53 void SetTabContents(TabContents* tab_contents); |
| 54 | 54 |
| 55 // Stacks the overlay at the top. | 55 // Stacks the overlay at the top. |
| 56 void StackAtTop(); | 56 void StackAtTop(); |
| 57 | 57 |
| 58 // Invoked when the instant preview is ready to be shown. | 58 // Invoked when the instant preview is ready to be shown. |
| 59 void InstantReady(); | 59 void InstantReady(); |
| 60 | 60 |
| 61 // chrome::search::SearchModelObserver overrides: | 61 // chrome::search::SearchModelObserver overrides: |
| 62 virtual void ModeChanged(const chrome::search::Mode& mode) OVERRIDE; | 62 virtual void ModeChanged(const chrome::search::Mode& old_mode, |
| 63 const chrome::search::Mode& new_mode) OVERRIDE; |
| 63 | 64 |
| 64 // ui::ImplicitAnimationObserver overrides: | 65 // ui::ImplicitAnimationObserver overrides: |
| 65 virtual void OnImplicitAnimationsCompleted() OVERRIDE; | 66 virtual void OnImplicitAnimationsCompleted() OVERRIDE; |
| 66 | 67 |
| 67 private: | 68 private: |
| 68 enum State { | 69 enum State { |
| 69 // Search/ntp is not visible. | 70 // Search/ntp is not visible. |
| 70 STATE_NOT_VISIBLE, | 71 STATE_NOT_VISIBLE, |
| 71 | 72 |
| 72 // Layout for the new tab page. | 73 // Layout for the new tab page. |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 views::View* search_container_; | 159 views::View* search_container_; |
| 159 views::View* ntp_view_; | 160 views::View* ntp_view_; |
| 160 views::View* logo_view_; | 161 views::View* logo_view_; |
| 161 views::WebView* content_view_; | 162 views::WebView* content_view_; |
| 162 OmniboxPopupViewParent* omnibox_popup_view_parent_; | 163 OmniboxPopupViewParent* omnibox_popup_view_parent_; |
| 163 | 164 |
| 164 DISALLOW_COPY_AND_ASSIGN(SearchViewController); | 165 DISALLOW_COPY_AND_ASSIGN(SearchViewController); |
| 165 }; | 166 }; |
| 166 | 167 |
| 167 #endif // CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_ | 168 #endif // CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_ |
| OLD | NEW |