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

Side by Side Diff: chrome/browser/extensions/api/web_request/web_request_api.cc

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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 | Annotate | Revision Log
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 "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/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "net/url_request/url_request.h" 68 #include "net/url_request/url_request.h"
69 #include "ui/base/l10n/l10n_util.h" 69 #include "ui/base/l10n/l10n_util.h"
70 #include "url/gurl.h" 70 #include "url/gurl.h"
71 71
72 using base::DictionaryValue; 72 using base::DictionaryValue;
73 using base::ListValue; 73 using base::ListValue;
74 using base::StringValue; 74 using base::StringValue;
75 using content::BrowserMessageFilter; 75 using content::BrowserMessageFilter;
76 using content::BrowserThread; 76 using content::BrowserThread;
77 using content::ResourceRequestInfo; 77 using content::ResourceRequestInfo;
78 using content::ResourceType;
78 using extensions::ErrorUtils; 79 using extensions::ErrorUtils;
79 using extensions::Extension; 80 using extensions::Extension;
80 using extensions::ExtensionWarning; 81 using extensions::ExtensionWarning;
81 using extensions::ExtensionWarningService; 82 using extensions::ExtensionWarningService;
82 using extensions::ExtensionWarningSet; 83 using extensions::ExtensionWarningSet;
83 using extensions::InfoMap; 84 using extensions::InfoMap;
84 using extensions::Feature; 85 using extensions::Feature;
85 using extensions::RulesRegistryService; 86 using extensions::RulesRegistryService;
86 using extensions::web_navigation_api_helpers::GetFrameId; 87 using extensions::web_navigation_api_helpers::GetFrameId;
87 88
(...skipping 2388 matching lines...) Expand 10 before | Expand all | Expand 10 after
2476 extensions::RuntimeData* runtime_data = 2477 extensions::RuntimeData* runtime_data =
2477 extensions::ExtensionSystem::Get(profile)->runtime_data(); 2478 extensions::ExtensionSystem::Get(profile)->runtime_data();
2478 for (extensions::ExtensionSet::const_iterator it = extensions.begin(); 2479 for (extensions::ExtensionSet::const_iterator it = extensions.begin();
2479 !webrequest_used && it != extensions.end(); 2480 !webrequest_used && it != extensions.end();
2480 ++it) { 2481 ++it) {
2481 webrequest_used |= runtime_data->HasUsedWebRequest(it->get()); 2482 webrequest_used |= runtime_data->HasUsedWebRequest(it->get());
2482 } 2483 }
2483 2484
2484 host->Send(new ExtensionMsg_UsingWebRequestAPI(webrequest_used)); 2485 host->Send(new ExtensionMsg_UsingWebRequestAPI(webrequest_used));
2485 } 2486 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698