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

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

Issue 2910823002: Mark plugin requires restart code/resources Linux-only. (Closed)
Patch Set: Created 3 years, 6 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 | « chrome/common/render_messages.h ('k') | 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 <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 case ChromeViewHostMsg_GetPluginInfo_Status::kComponentUpdateRequired: { 944 case ChromeViewHostMsg_GetPluginInfo_Status::kComponentUpdateRequired: {
945 placeholder = create_blocked_plugin( 945 placeholder = create_blocked_plugin(
946 IDR_BLOCKED_PLUGIN_HTML, 946 IDR_BLOCKED_PLUGIN_HTML,
947 l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED, group_name)); 947 l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED, group_name));
948 placeholder->AllowLoading(); 948 placeholder->AllowLoading();
949 render_frame->Send(new ChromeViewHostMsg_BlockedComponentUpdatedPlugin( 949 render_frame->Send(new ChromeViewHostMsg_BlockedComponentUpdatedPlugin(
950 render_frame->GetRoutingID(), placeholder->CreateRoutingId(), 950 render_frame->GetRoutingID(), placeholder->CreateRoutingId(),
951 identifier)); 951 identifier));
952 break; 952 break;
953 } 953 }
954 #if defined(OS_LINUX)
954 case ChromeViewHostMsg_GetPluginInfo_Status::kRestartRequired: { 955 case ChromeViewHostMsg_GetPluginInfo_Status::kRestartRequired: {
955 placeholder = create_blocked_plugin( 956 placeholder = create_blocked_plugin(
956 IDR_BLOCKED_PLUGIN_HTML, 957 IDR_BLOCKED_PLUGIN_HTML,
957 l10n_util::GetStringFUTF16(IDS_PLUGIN_RESTART_REQUIRED, 958 l10n_util::GetStringFUTF16(IDS_PLUGIN_RESTART_REQUIRED,
958 group_name)); 959 group_name));
959 break; 960 break;
960 } 961 }
962 #endif
961 } 963 }
962 } 964 }
963 placeholder->SetStatus(status); 965 placeholder->SetStatus(status);
964 return placeholder->plugin(); 966 return placeholder->plugin();
965 } 967 }
966 #endif // BUILDFLAG(ENABLE_PLUGINS) 968 #endif // BUILDFLAG(ENABLE_PLUGINS)
967 969
968 // For NaCl content handling plugins, the NaCl manifest is stored in an 970 // For NaCl content handling plugins, the NaCl manifest is stored in an
969 // additonal 'nacl' param associated with the MIME type. 971 // additonal 'nacl' param associated with the MIME type.
970 // static 972 // static
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
1571 1573
1572 RecordYouTubeRewriteUMA(result); 1574 RecordYouTubeRewriteUMA(result);
1573 return corrected_url.ReplaceComponents(r); 1575 return corrected_url.ReplaceComponents(r);
1574 } 1576 }
1575 1577
1576 std::unique_ptr<base::TaskScheduler::InitParams> 1578 std::unique_ptr<base::TaskScheduler::InitParams>
1577 ChromeContentRendererClient::GetTaskSchedulerInitParams() { 1579 ChromeContentRendererClient::GetTaskSchedulerInitParams() {
1578 return task_scheduler_util:: 1580 return task_scheduler_util::
1579 GetRendererTaskSchedulerInitParamsFromCommandLine(); 1581 GetRendererTaskSchedulerInitParamsFromCommandLine();
1580 } 1582 }
OLDNEW
« no previous file with comments | « chrome/common/render_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698