| 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 "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 | 79 |
| 80 // chrome::search::SearchModelObserver overrides: | 80 // chrome::search::SearchModelObserver overrides: |
| 81 virtual void ModeChanged(const chrome::search::Mode& old_mode, | 81 virtual void ModeChanged(const chrome::search::Mode& old_mode, |
| 82 const chrome::search::Mode& new_mode) OVERRIDE; | 82 const chrome::search::Mode& new_mode) OVERRIDE; |
| 83 | 83 |
| 84 // Get the bounds of the omnibox, relative to |destination| when in NTP mode. | 84 // Get the bounds of the omnibox, relative to |destination| when in NTP mode. |
| 85 // Returns empty bounds if not in NTP mode. Coordinates are converted from | 85 // Returns empty bounds if not in NTP mode. Coordinates are converted from |
| 86 // |ntp_container_| relative to |destination| relative. | 86 // |ntp_container_| relative to |destination| relative. |
| 87 gfx::Rect GetNTPOmniboxBounds(views::View* destination); | 87 gfx::Rect GetNTPOmniboxBounds(views::View* destination); |
| 88 | 88 |
| 89 // Sets whether the Instant overlay page has a custom provider logo. |
| 90 void SetInstantHasCustomLogo(bool has_logo); |
| 91 |
| 89 protected: | 92 protected: |
| 90 // ui::ImplicitAnimationObserver overrides: | 93 // ui::ImplicitAnimationObserver overrides: |
| 91 virtual void OnImplicitAnimationsCompleted() OVERRIDE; | 94 virtual void OnImplicitAnimationsCompleted() OVERRIDE; |
| 92 | 95 |
| 93 private: | 96 private: |
| 94 enum State { | 97 enum State { |
| 95 // Search/ntp is not visible. | 98 // Search/ntp is not visible. |
| 96 STATE_NOT_VISIBLE, | 99 STATE_NOT_VISIBLE, |
| 97 | 100 |
| 98 // Layout for the new tab page prior to web contents section being rendered. | 101 // Layout for the new tab page prior to web contents section being rendered. |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 // Lifetime is managed by this controller, not the parent |ntp_container_|. | 218 // Lifetime is managed by this controller, not the parent |ntp_container_|. |
| 216 scoped_ptr<views::Label> default_provider_name_; | 219 scoped_ptr<views::Label> default_provider_name_; |
| 217 | 220 |
| 218 // An alias to |contents_container_->active()|, but reparented within | 221 // An alias to |contents_container_->active()|, but reparented within |
| 219 // |ntp_container_| when in the NTP state. | 222 // |ntp_container_| when in the NTP state. |
| 220 views::WebView* content_view_; | 223 views::WebView* content_view_; |
| 221 | 224 |
| 222 // Container provided to clients to host the omnibox popup view. | 225 // Container provided to clients to host the omnibox popup view. |
| 223 internal::OmniboxPopupContainer* omnibox_popup_parent_; | 226 internal::OmniboxPopupContainer* omnibox_popup_parent_; |
| 224 | 227 |
| 228 // True iff the provider wants to show a custom logo in the Instant overlay. |
| 229 bool instant_has_custom_logo_; |
| 230 |
| 225 DISALLOW_COPY_AND_ASSIGN(SearchViewController); | 231 DISALLOW_COPY_AND_ASSIGN(SearchViewController); |
| 226 }; | 232 }; |
| 227 | 233 |
| 228 #endif // CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_ | 234 #endif // CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_ |
| OLD | NEW |