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/ui/webui/options/content_settings_handler.h" | 5 #include "chrome/browser/ui/webui/options/content_settings_handler.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 for (ExtensionSet::const_iterator extension = extensions->begin(); | 226 for (ExtensionSet::const_iterator extension = extensions->begin(); |
227 extension != extensions->end(); ++extension) { | 227 extension != extensions->end(); ++extension) { |
228 if (!app_filter(**extension, profile)) | 228 if (!app_filter(**extension, profile)) |
229 continue; | 229 continue; |
230 | 230 |
231 extensions::URLPatternSet web_extent = (*extension)->web_extent(); | 231 extensions::URLPatternSet web_extent = (*extension)->web_extent(); |
232 // Add patterns from web extent. | 232 // Add patterns from web extent. |
233 for (extensions::URLPatternSet::const_iterator pattern = web_extent.begin(); | 233 for (extensions::URLPatternSet::const_iterator pattern = web_extent.begin(); |
234 pattern != web_extent.end(); ++pattern) { | 234 pattern != web_extent.end(); ++pattern) { |
235 std::string url_pattern = pattern->GetAsString(); | 235 std::string url_pattern = pattern->GetAsString(); |
236 AddExceptionForHostedApp(url_pattern, **extension, exceptions); | 236 AddExceptionForHostedApp(url_pattern, *extension->get(), exceptions); |
237 } | 237 } |
238 // Retrieve the launch URL. | 238 // Retrieve the launch URL. |
239 GURL launch_url = extensions::AppLaunchInfo::GetLaunchWebURL(*extension); | 239 GURL launch_url = extensions::AppLaunchInfo::GetLaunchWebURL(*extension); |
240 // Skip adding the launch URL if it is part of the web extent. | 240 // Skip adding the launch URL if it is part of the web extent. |
241 if (web_extent.MatchesURL(launch_url)) | 241 if (web_extent.MatchesURL(launch_url)) |
242 continue; | 242 continue; |
243 AddExceptionForHostedApp(launch_url.spec(), **extension, exceptions); | 243 AddExceptionForHostedApp(launch_url.spec(), **extension, exceptions); |
244 } | 244 } |
245 } | 245 } |
246 | 246 |
(...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1385 media_settings_.flash_default_setting, | 1385 media_settings_.flash_default_setting, |
1386 media_settings_.flash_exceptions, | 1386 media_settings_.flash_exceptions, |
1387 media_settings_.policy_disable_audio, | 1387 media_settings_.policy_disable_audio, |
1388 media_settings_.policy_disable_video)) { | 1388 media_settings_.policy_disable_video)) { |
1389 ShowFlashMediaLink(EXCEPTIONS, true); | 1389 ShowFlashMediaLink(EXCEPTIONS, true); |
1390 } | 1390 } |
1391 } | 1391 } |
1392 } | 1392 } |
1393 | 1393 |
1394 } // namespace options | 1394 } // namespace options |
OLD | NEW |