| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_NTP_PRERENDERER_H_ | 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_PRERENDERER_H_ |
| 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_PRERENDERER_H_ | 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_PRERENDERER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 SwitchesToLocalNTPIfNoNTPReady); | 101 SwitchesToLocalNTPIfNoNTPReady); |
| 102 FRIEND_TEST_ALL_PREFIXES(InstantNTPPrerendererTest, | 102 FRIEND_TEST_ALL_PREFIXES(InstantNTPPrerendererTest, |
| 103 IsJavascriptEnabled); | 103 IsJavascriptEnabled); |
| 104 FRIEND_TEST_ALL_PREFIXES(InstantNTPPrerendererTest, | 104 FRIEND_TEST_ALL_PREFIXES(InstantNTPPrerendererTest, |
| 105 IsJavascriptEnabledChecksContentSettings); | 105 IsJavascriptEnabledChecksContentSettings); |
| 106 FRIEND_TEST_ALL_PREFIXES(InstantNTPPrerendererTest, | 106 FRIEND_TEST_ALL_PREFIXES(InstantNTPPrerendererTest, |
| 107 IsJavascriptEnabledChecksPrefs); | 107 IsJavascriptEnabledChecksPrefs); |
| 108 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest, MANUAL_ShowsGoogleNTP); | 108 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest, MANUAL_ShowsGoogleNTP); |
| 109 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest, | 109 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest, |
| 110 MANUAL_SearchesFromFakebox); | 110 MANUAL_SearchesFromFakebox); |
| 111 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); |
| 111 | 112 |
| 112 // Overridden from net::NetworkChangeNotifier::NetworkChangeObserver: | 113 // Overridden from net::NetworkChangeNotifier::NetworkChangeObserver: |
| 113 // If the network status changes, resets InstantNTP. | 114 // If the network status changes, resets InstantNTP. |
| 114 virtual void OnNetworkChanged(net::NetworkChangeNotifier::ConnectionType type) | 115 virtual void OnNetworkChanged(net::NetworkChangeNotifier::ConnectionType type) |
| 115 OVERRIDE; | 116 OVERRIDE; |
| 116 | 117 |
| 117 // Overridden from InstantPage::Delegate: | 118 // Overridden from InstantPage::Delegate: |
| 118 virtual void InstantSupportDetermined(const content::WebContents* contents, | 119 virtual void InstantSupportDetermined(const content::WebContents* contents, |
| 119 bool supports_instant) OVERRIDE; | 120 bool supports_instant) OVERRIDE; |
| 120 virtual void InstantPageAboutToNavigateMainFrame( | 121 virtual void InstantPageAboutToNavigateMainFrame( |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 | 157 |
| 157 // Preloaded InstantNTP. | 158 // Preloaded InstantNTP. |
| 158 scoped_ptr<InstantNTP> ntp_; | 159 scoped_ptr<InstantNTP> ntp_; |
| 159 | 160 |
| 160 PrefChangeRegistrar profile_pref_registrar_; | 161 PrefChangeRegistrar profile_pref_registrar_; |
| 161 | 162 |
| 162 DISALLOW_COPY_AND_ASSIGN(InstantNTPPrerenderer); | 163 DISALLOW_COPY_AND_ASSIGN(InstantNTPPrerenderer); |
| 163 }; | 164 }; |
| 164 | 165 |
| 165 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_PRERENDERER_H_ | 166 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_PRERENDERER_H_ |
| OLD | NEW |