| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 // Sets the active tab. | 51 // Sets the active tab. |
| 52 void SetTabContents(TabContents* tab_contents); | 52 void SetTabContents(TabContents* tab_contents); |
| 53 | 53 |
| 54 // Stacks the overlay at the top. | 54 // Stacks the overlay at the top. |
| 55 void StackAtTop(); | 55 void StackAtTop(); |
| 56 | 56 |
| 57 // Invoked when the instant preview is ready to be shown. | 57 // Invoked when the instant preview is ready to be shown. |
| 58 void InstantReady(); | 58 void InstantReady(); |
| 59 | 59 |
| 60 // chrome::search::SearchModelObserver overrides: | 60 // chrome::search::SearchModelObserver overrides: |
| 61 virtual void ModeChanged(const chrome::search::Mode& mode) OVERRIDE; | 61 virtual void ModeChanged(const chrome::search::Mode& old_mode, |
| 62 const chrome::search::Mode& new_mode) OVERRIDE; |
| 62 | 63 |
| 63 // ui::ImplicitAnimationObserver overrides: | 64 // ui::ImplicitAnimationObserver overrides: |
| 64 virtual void OnImplicitAnimationsCompleted() OVERRIDE; | 65 virtual void OnImplicitAnimationsCompleted() OVERRIDE; |
| 65 | 66 |
| 66 private: | 67 private: |
| 67 enum State { | 68 enum State { |
| 68 // Search/ntp is not visible. | 69 // Search/ntp is not visible. |
| 69 STATE_NOT_VISIBLE, | 70 STATE_NOT_VISIBLE, |
| 70 | 71 |
| 71 // Layout for the new tab page. | 72 // Layout for the new tab page. |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 // An alias to |contents_container_->active()|, but reparented within | 155 // An alias to |contents_container_->active()|, but reparented within |
| 155 // |ntp_view_| when in the NTP state. | 156 // |ntp_view_| when in the NTP state. |
| 156 views::WebView* content_view_; | 157 views::WebView* content_view_; |
| 157 | 158 |
| 158 OmniboxPopupViewParent* omnibox_popup_view_parent_; | 159 OmniboxPopupViewParent* omnibox_popup_view_parent_; |
| 159 | 160 |
| 160 DISALLOW_COPY_AND_ASSIGN(SearchViewController); | 161 DISALLOW_COPY_AND_ASSIGN(SearchViewController); |
| 161 }; | 162 }; |
| 162 | 163 |
| 163 #endif // CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_ | 164 #endif // CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_ |
| OLD | NEW |