Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(634)

Side by Side Diff: extensions/browser/updater/extension_downloader.cc

Issue 2900953002: Syntax errors in three network traffic annotations corrected. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/extensions/install_signer.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "extensions/browser/updater/extension_downloader.h" 5 #include "extensions/browser/updater/extension_downloader.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 destination: WEBSITE 499 destination: WEBSITE
500 } 500 }
501 policy { 501 policy {
502 cookies_allowed: false 502 cookies_allowed: false
503 setting: 503 setting:
504 "This feature cannot be disabled. It is only enabled when the user " 504 "This feature cannot be disabled. It is only enabled when the user "
505 "has installed extentions." 505 "has installed extentions."
506 chrome_policy { 506 chrome_policy {
507 ExtensionInstallBlacklist { 507 ExtensionInstallBlacklist {
508 policy_options {mode: MANDATORY} 508 policy_options {mode: MANDATORY}
509 ExtensionInstallBlacklist: '*' 509 ExtensionInstallBlacklist: {
510 entries: '*'
511 }
510 } 512 }
511 } 513 }
512 })"); 514 })");
513 manifest_fetcher_ = 515 manifest_fetcher_ =
514 net::URLFetcher::Create(kManifestFetcherId, active_request->full_url(), 516 net::URLFetcher::Create(kManifestFetcherId, active_request->full_url(),
515 net::URLFetcher::GET, this, traffic_annotation); 517 net::URLFetcher::GET, this, traffic_annotation);
516 manifest_fetcher_->SetRequestContext(request_context_.get()); 518 manifest_fetcher_->SetRequestContext(request_context_.get());
517 manifest_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | 519 manifest_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
518 net::LOAD_DO_NOT_SAVE_COOKIES | 520 net::LOAD_DO_NOT_SAVE_COOKIES |
519 net::LOAD_DISABLE_CACHE); 521 net::LOAD_DISABLE_CACHE);
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 } 828 }
827 policy { 829 policy {
828 cookies_allowed: true 830 cookies_allowed: true
829 cookies_store: "user" 831 cookies_store: "user"
830 setting: 832 setting:
831 "This feature cannot be disabled. It is only enabled when the user " 833 "This feature cannot be disabled. It is only enabled when the user "
832 "has installed extentions and it needs updating." 834 "has installed extentions and it needs updating."
833 chrome_policy { 835 chrome_policy {
834 ExtensionInstallBlacklist { 836 ExtensionInstallBlacklist {
835 policy_options {mode: MANDATORY} 837 policy_options {mode: MANDATORY}
836 ExtensionInstallBlacklist: '*' 838 ExtensionInstallBlacklist: {
839 entries: '*'
840 }
837 } 841 }
838 } 842 }
839 })"); 843 })");
840 extension_fetcher_ = 844 extension_fetcher_ =
841 net::URLFetcher::Create(kExtensionFetcherId, fetch->url, 845 net::URLFetcher::Create(kExtensionFetcherId, fetch->url,
842 net::URLFetcher::GET, this, traffic_annotation); 846 net::URLFetcher::GET, this, traffic_annotation);
843 extension_fetcher_->SetRequestContext(request_context_.get()); 847 extension_fetcher_->SetRequestContext(request_context_.get());
844 extension_fetcher_->SetAutomaticallyRetryOnNetworkChanges(3); 848 extension_fetcher_->SetAutomaticallyRetryOnNetworkChanges(3);
845 849
846 int load_flags = net::LOAD_DISABLE_CACHE; 850 int load_flags = net::LOAD_DISABLE_CACHE;
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 ManifestFetchData::FetchPriority fetch_priority) { 1052 ManifestFetchData::FetchPriority fetch_priority) {
1049 ManifestFetchData::PingMode ping_mode = ManifestFetchData::NO_PING; 1053 ManifestFetchData::PingMode ping_mode = ManifestFetchData::NO_PING;
1050 if (update_url.DomainIs(ping_enabled_domain_.c_str())) 1054 if (update_url.DomainIs(ping_enabled_domain_.c_str()))
1051 ping_mode = ManifestFetchData::PING_WITH_ENABLED_STATE; 1055 ping_mode = ManifestFetchData::PING_WITH_ENABLED_STATE;
1052 return new ManifestFetchData(update_url, request_id, brand_code_, 1056 return new ManifestFetchData(update_url, request_id, brand_code_,
1053 manifest_query_params_, ping_mode, 1057 manifest_query_params_, ping_mode,
1054 fetch_priority); 1058 fetch_priority);
1055 } 1059 }
1056 1060
1057 } // namespace extensions 1061 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/install_signer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698