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

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

Issue 2156763003: Extend the webRequest.onCompleted event details object with TLS/SSL information Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Consistently use key constants for dict fields and simplify validation error reporting Created 3 years, 10 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
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/api/web_request/web_request_api.h" 5 #include "extensions/browser/api/web_request/web_request_api.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" 52 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
53 #include "extensions/browser/info_map.h" 53 #include "extensions/browser/info_map.h"
54 #include "extensions/browser/io_thread_extension_message_filter.h" 54 #include "extensions/browser/io_thread_extension_message_filter.h"
55 #include "extensions/browser/runtime_data.h" 55 #include "extensions/browser/runtime_data.h"
56 #include "extensions/browser/warning_service.h" 56 #include "extensions/browser/warning_service.h"
57 #include "extensions/browser/warning_set.h" 57 #include "extensions/browser/warning_set.h"
58 #include "extensions/common/api/web_request.h" 58 #include "extensions/common/api/web_request.h"
59 #include "extensions/common/error_utils.h" 59 #include "extensions/common/error_utils.h"
60 #include "extensions/common/event_filtering_info.h" 60 #include "extensions/common/event_filtering_info.h"
61 #include "extensions/common/extension.h" 61 #include "extensions/common/extension.h"
62 #include "extensions/common/feature_switch.h"
62 #include "extensions/common/features/feature.h" 63 #include "extensions/common/features/feature.h"
63 #include "extensions/common/permissions/permissions_data.h" 64 #include "extensions/common/permissions/permissions_data.h"
64 #include "extensions/common/url_pattern.h" 65 #include "extensions/common/url_pattern.h"
65 #include "extensions/strings/grit/extensions_strings.h" 66 #include "extensions/strings/grit/extensions_strings.h"
66 #include "net/base/auth.h" 67 #include "net/base/auth.h"
67 #include "net/base/net_errors.h" 68 #include "net/base/net_errors.h"
68 #include "net/http/http_util.h" 69 #include "net/http/http_util.h"
69 #include "net/url_request/url_request.h" 70 #include "net/url_request/url_request.h"
70 #include "ui/base/l10n/l10n_util.h" 71 #include "ui/base/l10n/l10n_util.h"
71 #include "url/gurl.h" 72 #include "url/gurl.h"
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 RawListeners listeners = GetMatchingListeners( 951 RawListeners listeners = GetMatchingListeners(
951 browser_context, extension_info_map, navigation_ui_data, 952 browser_context, extension_info_map, navigation_ui_data,
952 keys::kOnCompletedEvent, request, &extra_info_spec); 953 keys::kOnCompletedEvent, request, &extra_info_spec);
953 if (listeners.empty()) 954 if (listeners.empty())
954 return; 955 return;
955 956
956 std::unique_ptr<WebRequestEventDetails> event_details( 957 std::unique_ptr<WebRequestEventDetails> event_details(
957 CreateEventDetails(request, extra_info_spec)); 958 CreateEventDetails(request, extra_info_spec));
958 event_details->SetResponseHeaders(request, request->response_headers()); 959 event_details->SetResponseHeaders(request, request->response_headers());
959 event_details->SetResponseSource(request); 960 event_details->SetResponseSource(request);
961 if (FeatureSwitch::webrequest_ssl_info()->IsEnabled() &&
962 request->ssl_info().is_valid())
Ryan Sleevi 2017/01/31 21:37:56 Braces
963 event_details->SetSSLInfo(request);
960 964
961 DispatchEvent(browser_context, request, listeners, navigation_ui_data, 965 DispatchEvent(browser_context, request, listeners, navigation_ui_data,
962 std::move(event_details)); 966 std::move(event_details));
963 } 967 }
964 968
965 // Deprecated. 969 // Deprecated.
966 // TODO(maksims): Remove this. 970 // TODO(maksims): Remove this.
967 void ExtensionWebRequestEventRouter::OnCompleted( 971 void ExtensionWebRequestEventRouter::OnCompleted(
968 void* browser_context, 972 void* browser_context,
969 const InfoMap* extension_info_map, 973 const InfoMap* extension_info_map,
(...skipping 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
2390 // Since EventListeners are segmented by browser_context, check that 2394 // Since EventListeners are segmented by browser_context, check that
2391 // last, as it is exceedingly unlikely to be different. 2395 // last, as it is exceedingly unlikely to be different.
2392 return extension_id == that.extension_id && 2396 return extension_id == that.extension_id &&
2393 sub_event_name == that.sub_event_name && 2397 sub_event_name == that.sub_event_name &&
2394 web_view_instance_id == that.web_view_instance_id && 2398 web_view_instance_id == that.web_view_instance_id &&
2395 embedder_process_id == that.embedder_process_id && 2399 embedder_process_id == that.embedder_process_id &&
2396 browser_context == that.browser_context; 2400 browser_context == that.browser_context;
2397 } 2401 }
2398 2402
2399 } // namespace extensions 2403 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698