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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 1552383002: whitelist hangouts.google.com for nacl plugin loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | no next file » | 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/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 } 984 }
985 bool is_hangouts_app = 985 bool is_hangouts_app =
986 // Whitelisted apps must be served over secure scheme. 986 // Whitelisted apps must be served over secure scheme.
987 app_url.SchemeIsCryptographic() && manifest_url.SchemeIsFileSystem() && 987 app_url.SchemeIsCryptographic() && manifest_url.SchemeIsFileSystem() &&
988 manifest_url.inner_url()->SchemeIsCryptographic() && 988 manifest_url.inner_url()->SchemeIsCryptographic() &&
989 (base::EndsWith(app_url_host, "talkgadget.google.com", 989 (base::EndsWith(app_url_host, "talkgadget.google.com",
990 base::CompareCase::INSENSITIVE_ASCII) || 990 base::CompareCase::INSENSITIVE_ASCII) ||
991 base::EndsWith(app_url_host, "plus.google.com", 991 base::EndsWith(app_url_host, "plus.google.com",
992 base::CompareCase::INSENSITIVE_ASCII) || 992 base::CompareCase::INSENSITIVE_ASCII) ||
993 base::EndsWith(app_url_host, "plus.sandbox.google.com", 993 base::EndsWith(app_url_host, "plus.sandbox.google.com",
994 base::CompareCase::INSENSITIVE_ASCII) ||
995 base::EndsWith(app_url_host, "hangouts.google.com",
994 base::CompareCase::INSENSITIVE_ASCII)) && 996 base::CompareCase::INSENSITIVE_ASCII)) &&
995 // The manifest must be loaded from the host's FileSystem. 997 // The manifest must be loaded from the host's FileSystem.
996 (manifest_fs_host == app_url_host); 998 (manifest_fs_host == app_url_host);
997 999
998 bool is_whitelisted_app = is_photo_app || is_hangouts_app; 1000 bool is_whitelisted_app = is_photo_app || is_hangouts_app;
999 1001
1000 bool is_invoked_by_webstore_installed_extension = false; 1002 bool is_invoked_by_webstore_installed_extension = false;
1001 bool is_extension_unrestricted = false; 1003 bool is_extension_unrestricted = false;
1002 bool is_extension_force_installed = false; 1004 bool is_extension_force_installed = false;
1003 #if defined(ENABLE_EXTENSIONS) 1005 #if defined(ENABLE_EXTENSIONS)
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1465 // chrome.system.network.getNetworkInterfaces provides the same 1467 // chrome.system.network.getNetworkInterfaces provides the same
1466 // information. Also, the enforcement of sending and binding UDP is already done 1468 // information. Also, the enforcement of sending and binding UDP is already done
1467 // by chrome extension permission model. 1469 // by chrome extension permission model.
1468 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { 1470 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() {
1469 #if defined(ENABLE_EXTENSIONS) 1471 #if defined(ENABLE_EXTENSIONS)
1470 return !IsStandaloneExtensionProcess(); 1472 return !IsStandaloneExtensionProcess();
1471 #else 1473 #else
1472 return true; 1474 return true;
1473 #endif 1475 #endif
1474 } 1476 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698