| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_INSTANT_INSTANT_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 6 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 virtual void SwappedTabContents(InstantLoader* loader) OVERRIDE; | 191 virtual void SwappedTabContents(InstantLoader* loader) OVERRIDE; |
| 192 | 192 |
| 193 private: | 193 private: |
| 194 friend class InstantTest; | 194 friend class InstantTest; |
| 195 | 195 |
| 196 enum PreviewCondition { | 196 enum PreviewCondition { |
| 197 PREVIEW_CONDITION_SUCCESS, | 197 PREVIEW_CONDITION_SUCCESS, |
| 198 PREVIEW_CONDITION_INVALID_TEMPLATE_URL, | 198 PREVIEW_CONDITION_INVALID_TEMPLATE_URL, |
| 199 PREVIEW_CONDITION_JAVASCRIPT_SCHEME, | 199 PREVIEW_CONDITION_JAVASCRIPT_SCHEME, |
| 200 PREVIEW_CONDITION_EXTENSION_KEYWORD, | 200 PREVIEW_CONDITION_EXTENSION_KEYWORD, |
| 201 PREVIEW_CONDITION_BLACKLISTED, | 201 PREVIEW_CONDITION_BLACKLISTED_HOST, |
| 202 PREVIEW_CONDITION_BLACKLISTED_URL, |
| 202 PREVIEW_CONDITION_INSTANT_SEARCH_ONLY, | 203 PREVIEW_CONDITION_INSTANT_SEARCH_ONLY, |
| 203 }; | 204 }; |
| 204 | 205 |
| 205 typedef std::set<std::string> HostBlacklist; | 206 typedef std::set<std::string> HostBlacklist; |
| 206 | 207 |
| 207 // Updates |displayable_loader_| and if necessary notifies the delegate. | 208 // Updates |displayable_loader_| and if necessary notifies the delegate. |
| 208 void UpdateDisplayableLoader(); | 209 void UpdateDisplayableLoader(); |
| 209 | 210 |
| 210 // Returns the TabContents of the pending loader (or NULL). This is only used | 211 // Returns the TabContents of the pending loader (or NULL). This is only used |
| 211 // for testing. | 212 // for testing. |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 ScopedVector<InstantLoader> loaders_to_destroy_; | 308 ScopedVector<InstantLoader> loaders_to_destroy_; |
| 308 | 309 |
| 309 // The set of hosts that we don't use instant with. This is shared across all | 310 // The set of hosts that we don't use instant with. This is shared across all |
| 310 // instances and only maintained for the current session. | 311 // instances and only maintained for the current session. |
| 311 static HostBlacklist* host_blacklist_; | 312 static HostBlacklist* host_blacklist_; |
| 312 | 313 |
| 313 DISALLOW_COPY_AND_ASSIGN(InstantController); | 314 DISALLOW_COPY_AND_ASSIGN(InstantController); |
| 314 }; | 315 }; |
| 315 | 316 |
| 316 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 317 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ |
| OLD | NEW |