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

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

Issue 319553008: Updated Plugin bubble model to add "learn more" link and to appear with a sliding yellow thing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated so that the yellow thing occurs only when the content setting is set to allow Created 6 years, 5 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/browser/ui/views/content_setting_bubble_contents.cc ('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 "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/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 plugin, 807 plugin,
808 identifier, 808 identifier,
809 group_name, 809 group_name,
810 IDR_BLOCKED_PLUGIN_HTML, 810 IDR_BLOCKED_PLUGIN_HTML,
811 l10n_util::GetStringFUTF16(IDS_PLUGIN_NOT_AUTHORIZED, group_name)); 811 l10n_util::GetStringFUTF16(IDS_PLUGIN_NOT_AUTHORIZED, group_name));
812 placeholder->set_allow_loading(true); 812 placeholder->set_allow_loading(true);
813 render_frame->Send(new ChromeViewHostMsg_BlockedUnauthorizedPlugin( 813 render_frame->Send(new ChromeViewHostMsg_BlockedUnauthorizedPlugin(
814 render_frame->GetRoutingID(), 814 render_frame->GetRoutingID(),
815 group_name, 815 group_name,
816 identifier)); 816 identifier));
817 // Send IPC for showing content_setting_image/bubble.
818 observer->DidBlockContentType(content_type);
817 break; 819 break;
818 } 820 }
819 case ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay: { 821 case ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay: {
820 placeholder = ChromePluginPlaceholder::CreateBlockedPlugin( 822 placeholder = ChromePluginPlaceholder::CreateBlockedPlugin(
821 render_frame, 823 render_frame,
822 frame, 824 frame,
823 params, 825 params,
824 plugin, 826 plugin,
825 identifier, 827 identifier,
826 group_name, 828 group_name,
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 CommandLine* command_line = CommandLine::ForCurrentProcess(); 1418 CommandLine* command_line = CommandLine::ForCurrentProcess();
1417 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); 1419 return !command_line->HasSwitch(extensions::switches::kExtensionProcess);
1418 } 1420 }
1419 1421
1420 blink::WebWorkerPermissionClientProxy* 1422 blink::WebWorkerPermissionClientProxy*
1421 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( 1423 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
1422 content::RenderFrame* render_frame, 1424 content::RenderFrame* render_frame,
1423 blink::WebFrame* frame) { 1425 blink::WebFrame* frame) {
1424 return new WorkerPermissionClientProxy(render_frame, frame); 1426 return new WorkerPermissionClientProxy(render_frame, frame);
1425 } 1427 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/content_setting_bubble_contents.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698