| 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/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 8 #include "base/debug/crash_logging.h" | 10 #include "base/debug/crash_logging.h" |
| 9 #include "base/logging.h" | 11 #include "base/logging.h" |
| 10 #include "base/macros.h" | 12 #include "base/macros.h" |
| 11 #include "base/metrics/field_trial.h" | 13 #include "base/metrics/field_trial.h" |
| 12 #include "base/metrics/histogram.h" | 14 #include "base/metrics/histogram.h" |
| 13 #include "base/metrics/user_metrics_action.h" | 15 #include "base/metrics/user_metrics_action.h" |
| 14 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
| 15 #include "base/strings/string_util.h" | 17 #include "base/strings/string_util.h" |
| 16 #include "base/strings/utf_string_conversions.h" | 18 #include "base/strings/utf_string_conversions.h" |
| (...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 783 if (power_saver_info.power_saver_enabled) { | 785 if (power_saver_info.power_saver_enabled) { |
| 784 throttler = PluginInstanceThrottler::Create(); | 786 throttler = PluginInstanceThrottler::Create(); |
| 785 // PluginPreroller manages its own lifetime. | 787 // PluginPreroller manages its own lifetime. |
| 786 new PluginPreroller( | 788 new PluginPreroller( |
| 787 render_frame, frame, params, info, identifier, group_name, | 789 render_frame, frame, params, info, identifier, group_name, |
| 788 l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name), | 790 l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name), |
| 789 throttler.get()); | 791 throttler.get()); |
| 790 } | 792 } |
| 791 | 793 |
| 792 return render_frame->CreatePlugin(frame, info, params, | 794 return render_frame->CreatePlugin(frame, info, params, |
| 793 throttler.Pass()); | 795 std::move(throttler)); |
| 794 } | 796 } |
| 795 case ChromeViewHostMsg_GetPluginInfo_Status::kNPAPINotSupported: { | 797 case ChromeViewHostMsg_GetPluginInfo_Status::kNPAPINotSupported: { |
| 796 RenderThread::Get()->RecordAction( | 798 RenderThread::Get()->RecordAction( |
| 797 UserMetricsAction("Plugin_NPAPINotSupported")); | 799 UserMetricsAction("Plugin_NPAPINotSupported")); |
| 798 placeholder = create_blocked_plugin( | 800 placeholder = create_blocked_plugin( |
| 799 IDR_BLOCKED_PLUGIN_HTML, | 801 IDR_BLOCKED_PLUGIN_HTML, |
| 800 l10n_util::GetStringUTF16(IDS_PLUGIN_NOT_SUPPORTED_METRO)); | 802 l10n_util::GetStringUTF16(IDS_PLUGIN_NOT_SUPPORTED_METRO)); |
| 801 render_frame->Send(new ChromeViewHostMsg_NPAPINotSupported( | 803 render_frame->Send(new ChromeViewHostMsg_NPAPINotSupported( |
| 802 render_frame->GetRoutingID(), identifier)); | 804 render_frame->GetRoutingID(), identifier)); |
| 803 break; | 805 break; |
| (...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1409 // chrome.system.network.getNetworkInterfaces provides the same | 1411 // chrome.system.network.getNetworkInterfaces provides the same |
| 1410 // information. Also, the enforcement of sending and binding UDP is already done | 1412 // information. Also, the enforcement of sending and binding UDP is already done |
| 1411 // by chrome extension permission model. | 1413 // by chrome extension permission model. |
| 1412 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { | 1414 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { |
| 1413 #if defined(ENABLE_EXTENSIONS) | 1415 #if defined(ENABLE_EXTENSIONS) |
| 1414 return !IsStandaloneExtensionProcess(); | 1416 return !IsStandaloneExtensionProcess(); |
| 1415 #else | 1417 #else |
| 1416 return true; | 1418 return true; |
| 1417 #endif | 1419 #endif |
| 1418 } | 1420 } |
| OLD | NEW |