| OLD | NEW |
| 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 "chrome/browser/extensions/api/web_request/web_request_api.h" | 5 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 extensions::UploadDataPresenter* const presenters[] = { | 188 extensions::UploadDataPresenter* const presenters[] = { |
| 189 &parsed_data_presenter, // 1: any parseable forms? (Specific to forms.) | 189 &parsed_data_presenter, // 1: any parseable forms? (Specific to forms.) |
| 190 &raw_data_presenter // 2: any data at all? (Non-specific.) | 190 &raw_data_presenter // 2: any data at all? (Non-specific.) |
| 191 }; | 191 }; |
| 192 // Keys for the results of the corresponding presenters. | 192 // Keys for the results of the corresponding presenters. |
| 193 static const char* const kKeys[] = { | 193 static const char* const kKeys[] = { |
| 194 keys::kRequestBodyFormDataKey, | 194 keys::kRequestBodyFormDataKey, |
| 195 keys::kRequestBodyRawKey | 195 keys::kRequestBodyRawKey |
| 196 }; | 196 }; |
| 197 | 197 |
| 198 const std::vector<net::UploadElement>* elements = | 198 const ScopedVector<net::UploadElement>& elements = |
| 199 request->get_upload()->elements(); | 199 request->get_upload()->elements(); |
| 200 bool some_succeeded = false; | 200 bool some_succeeded = false; |
| 201 for (size_t i = 0; !some_succeeded && i < arraysize(presenters); ++i) { | 201 for (size_t i = 0; !some_succeeded && i < arraysize(presenters); ++i) { |
| 202 std::vector<net::UploadElement>::const_iterator element; | 202 ScopedVector<net::UploadElement>::const_iterator element; |
| 203 for (element = elements->begin(); element != elements->end(); ++element) | 203 for (element = elements.begin(); element != elements.end(); ++element) |
| 204 presenters[i]->FeedNext(*element); | 204 presenters[i]->FeedNext(**element); |
| 205 if (presenters[i]->Succeeded()) { | 205 if (presenters[i]->Succeeded()) { |
| 206 requestBody->Set(kKeys[i], presenters[i]->Result().release()); | 206 requestBody->Set(kKeys[i], presenters[i]->Result().release()); |
| 207 some_succeeded = true; | 207 some_succeeded = true; |
| 208 } | 208 } |
| 209 } | 209 } |
| 210 if (!some_succeeded) | 210 if (!some_succeeded) |
| 211 requestBody->SetString(keys::kRequestBodyErrorKey, "Unknown error."); | 211 requestBody->SetString(keys::kRequestBodyErrorKey, "Unknown error."); |
| 212 } | 212 } |
| 213 | 213 |
| 214 // Converts a HttpHeaders dictionary to a |name|, |value| pair. Returns | 214 // Converts a HttpHeaders dictionary to a |name|, |value| pair. Returns |
| (...skipping 1683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1898 } else if ((*it)->name().find("AdBlock") != std::string::npos) { | 1898 } else if ((*it)->name().find("AdBlock") != std::string::npos) { |
| 1899 adblock = true; | 1899 adblock = true; |
| 1900 } else { | 1900 } else { |
| 1901 other = true; | 1901 other = true; |
| 1902 } | 1902 } |
| 1903 } | 1903 } |
| 1904 } | 1904 } |
| 1905 | 1905 |
| 1906 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); | 1906 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); |
| 1907 } | 1907 } |
| OLD | NEW |