| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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_SEARCH_INSTANT_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged); | 289 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged); |
| 290 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchProviderForLocalNTP); | 290 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchProviderForLocalNTP); |
| 291 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 291 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 292 AcceptingURLSearchDoesNotNavigate); | 292 AcceptingURLSearchDoesNotNavigate); |
| 293 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, AcceptingJSSearchDoesNotRunJS); | 293 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, AcceptingJSSearchDoesNotRunJS); |
| 294 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 294 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 295 ReloadSearchAfterBackReloadsCorrectQuery); | 295 ReloadSearchAfterBackReloadsCorrectQuery); |
| 296 FRIEND_TEST_ALL_PREFIXES( | 296 FRIEND_TEST_ALL_PREFIXES( |
| 297 InstantExtendedFirstTabTest, RedirectToLocalOnLoadFailure); | 297 InstantExtendedFirstTabTest, RedirectToLocalOnLoadFailure); |
| 298 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, LogDropdownShown); | 298 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, LogDropdownShown); |
| 299 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 300 OverlayDoesNotEchoSearchProviderNAVSUGGEST); |
| 299 | 301 |
| 300 Profile* profile() const; | 302 Profile* profile() const; |
| 301 | 303 |
| 302 // Overridden from content::NotificationObserver: | 304 // Overridden from content::NotificationObserver: |
| 303 virtual void Observe(int type, | 305 virtual void Observe(int type, |
| 304 const content::NotificationSource& source, | 306 const content::NotificationSource& source, |
| 305 const content::NotificationDetails& details) OVERRIDE; | 307 const content::NotificationDetails& details) OVERRIDE; |
| 306 | 308 |
| 307 // Overridden from InstantPage::Delegate: | 309 // Overridden from InstantPage::Delegate: |
| 308 // TODO(shishir): We assume that the WebContent's current RenderViewHost is | 310 // TODO(shishir): We assume that the WebContent's current RenderViewHost is |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 // Used for Top Sites async retrieval. | 546 // Used for Top Sites async retrieval. |
| 545 base::WeakPtrFactory<InstantController> weak_ptr_factory_; | 547 base::WeakPtrFactory<InstantController> weak_ptr_factory_; |
| 546 | 548 |
| 547 // Used to get notifications about Most Visted changes. | 549 // Used to get notifications about Most Visted changes. |
| 548 content::NotificationRegistrar registrar_; | 550 content::NotificationRegistrar registrar_; |
| 549 | 551 |
| 550 DISALLOW_COPY_AND_ASSIGN(InstantController); | 552 DISALLOW_COPY_AND_ASSIGN(InstantController); |
| 551 }; | 553 }; |
| 552 | 554 |
| 553 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 555 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
| OLD | NEW |