Index: chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc |
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc |
index 12d6b2f1c50ade6f3d7ab02dd611ca7995ebf8eb..854ecab90e61411b7b8eb699520efe4414b97bee 100644 |
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc |
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc |
@@ -34,6 +34,7 @@ |
#include "components/sync/driver/sync_service_utils.h" |
#include "content/public/browser/notification_service.h" |
#include "extensions/features/features.h" |
+#include "net/traffic_annotation/network_traffic_annotation.h" |
#if BUILDFLAG(ENABLE_EXTENSIONS) |
#include "chrome/browser/autocomplete/keyword_extensions_delegate_impl.h" |
@@ -248,7 +249,47 @@ void ChromeAutocompleteProviderClient::PrefetchImage(const GURL& url) { |
BitmapFetcherService* image_service = |
BitmapFetcherServiceFactory::GetForBrowserContext(profile_); |
DCHECK(image_service); |
- image_service->Prefetch(url); |
+ |
+ // TODO(jdonnelly@, rhalavati@): Create a helper function with Callback to |
Justin Donnelly
2017/02/16 14:53:18
I've never seen @ used in a TODO. Unless there was
Ramin Halavati
2017/02/17 06:30:12
Done.
|
+ // create annotation and pass it to image_service, merging this annotation and |
+ // the one in "c/b/ui/omnibox/chrome_omnibox_client.cc". |
+ net::NetworkTrafficAnnotationTag traffic_annotation = |
+ net::DefineNetworkTrafficAnnotation("omnibox_prefetch_image", R"( |
+ semantics { |
+ sender: "Omnibox Suggest Prefetch" |
+ description: |
+ "Google Chrome provides answers in the suggestion list to the " |
+ "queries you type in the omnibox. This request retrieves a " |
+ "small image (for example, an icon illustrating the current " |
+ "weather conditions) when this can add information to the " |
+ "answer." |
+ trigger: |
+ "Change of results for the query typed by the user in the " |
+ "omnibox." |
+ data: |
+ "The only data sent is the path to an image. No user data is " |
+ "included, although the general weather condition (sunny, " |
+ "rainy, etc.) in the user's current location could be inferred " |
+ "from the name of the image in the path." |
+ destination: WEBSITE |
+ } |
+ policy { |
+ cookies_allowed: true |
+ cookies_store: "user" |
+ setting: |
+ "You can enable or disable this feature via 'Use a prediction " |
+ "service to help complete searches and URLs typed in the " |
+ "address bar.' in Chrome's settings under Advanced. The " |
+ "feature is enabled by default." |
+ policy { |
+ SearchSuggestEnabled { |
+ policy_options {mode: MANDATORY} |
+ value: false |
+ } |
+ } |
+ })"); |
+ |
+ image_service->Prefetch(url, traffic_annotation); |
} |
void ChromeAutocompleteProviderClient::OnAutocompleteControllerResultReady( |