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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2344293002: [HBD] Detect user-initiated Flash download in a new window (Closed)
Patch Set: fix mac test Created 4 years, 2 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 | « no previous file | chrome/browser/content_settings/host_content_settings_map_factory.cc » ('j') | 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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2235 matching lines...) Expand 10 before | Expand all | Expand 10 after
2246 ? APP_LOADED_IN_TAB_SOURCE_BACKGROUND_PAGE 2246 ? APP_LOADED_IN_TAB_SOURCE_BACKGROUND_PAGE
2247 : APP_LOADED_IN_TAB_SOURCE_APP; 2247 : APP_LOADED_IN_TAB_SOURCE_APP;
2248 UMA_HISTOGRAM_ENUMERATION("Extensions.AppLoadedInTab", source, 2248 UMA_HISTOGRAM_ENUMERATION("Extensions.AppLoadedInTab", source,
2249 APP_LOADED_IN_TAB_SOURCE_MAX); 2249 APP_LOADED_IN_TAB_SOURCE_MAX);
2250 } 2250 }
2251 } 2251 }
2252 #endif 2252 #endif
2253 2253
2254 HostContentSettingsMap* content_settings = 2254 HostContentSettingsMap* content_settings =
2255 ProfileIOData::FromResourceContext(context)->GetHostContentSettingsMap(); 2255 ProfileIOData::FromResourceContext(context)->GetHostContentSettingsMap();
2256
2257 #if defined(ENABLE_PLUGINS)
2258 if (FlashDownloadInterception::ShouldStopFlashDownloadAction(
2259 content_settings, opener_top_level_frame_url, target_url,
2260 user_gesture)) {
2261 // TODO(crbug.com/626728): Implement permission prompt logic.
2262 return false;
2263 }
2264 #endif
2265
2256 BlockedWindowParams blocked_params(target_url, 2266 BlockedWindowParams blocked_params(target_url,
2257 referrer, 2267 referrer,
2258 frame_name, 2268 frame_name,
2259 disposition, 2269 disposition,
2260 features, 2270 features,
2261 user_gesture, 2271 user_gesture,
2262 opener_suppressed, 2272 opener_suppressed,
2263 render_process_id, 2273 render_process_id,
2264 opener_render_frame_id); 2274 opener_render_frame_id);
2265 2275
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after
3168 if (channel <= kMaxDisableEncryptionChannel) { 3178 if (channel <= kMaxDisableEncryptionChannel) {
3169 static const char* const kWebRtcDevSwitchNames[] = { 3179 static const char* const kWebRtcDevSwitchNames[] = {
3170 switches::kDisableWebRtcEncryption, 3180 switches::kDisableWebRtcEncryption,
3171 }; 3181 };
3172 to_command_line->CopySwitchesFrom(from_command_line, 3182 to_command_line->CopySwitchesFrom(from_command_line,
3173 kWebRtcDevSwitchNames, 3183 kWebRtcDevSwitchNames,
3174 arraysize(kWebRtcDevSwitchNames)); 3184 arraysize(kWebRtcDevSwitchNames));
3175 } 3185 }
3176 } 3186 }
3177 #endif // defined(ENABLE_WEBRTC) 3187 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/content_settings/host_content_settings_map_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698